diff --git a/js/src/tests/user.js b/js/src/tests/user.js index bbbf0870612..b87c817e587 100755 --- a/js/src/tests/user.js +++ b/js/src/tests/user.js @@ -16,7 +16,6 @@ user_pref("dom.max_chrome_script_run_time", 0); user_pref("javascript.allow.mailnews", true); user_pref("javascript.options.showInConsole", true); user_pref("layout.css.report_errors", true); -user_pref("security.enable_java", false); user_pref("security.warn_entering_secure", false); user_pref("security.warn_entering_weak", false); user_pref("security.warn_leaving_secure", false); diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index 4fd58a065cc..2d534dc2619 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -2051,7 +2051,6 @@ pref("print.print_extra_margin", 90); // twips (90 twips is an eigth of an inch) pref("print.extend_native_print_dialog", true); // Locate Java by scanning the Sun JRE installation directory with a minimum version -// Note: Does not scan if security.enable_java is not true pref("plugin.scan.SunJRE", "1.3"); // Locate plugins by scanning the Adobe Acrobat installation directory with a minimum version