Remove remaining default plugin references. b=567464 r=jst
authorJosh Aas <joshmoz@gmail.com>
Wed, 26 May 2010 19:18:06 -0400
changeset 42848 35b9ae4922a249fae4671608d81795e9b5955b4f
parent 42847 adf3e43ffdd9ce4c3e24d4cd2add37cbf18a3d22
child 42849 af2bc8c327a4c0aae082b639ccaaf36c30ca6a8e
push id13473
push userjosh@mozilla.com
push dateWed, 26 May 2010 23:18:25 +0000
treeherdermozilla-central@35b9ae4922a2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjst
bugs567464
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Remove remaining default plugin references. b=567464 r=jst
dom/base/nsMimeTypeArray.cpp
js/src/tests/e4x/Regress/regress-308111.js
testing/tests/memtest.py
toolkit/toolkit-makefiles.sh
--- a/dom/base/nsMimeTypeArray.cpp
+++ b/dom/base/nsMimeTypeArray.cpp
@@ -306,24 +306,17 @@ nsMimeType::GetDescription(nsAString& aD
 }
 
 NS_IMETHODIMP
 nsMimeType::GetEnabledPlugin(nsIDOMPlugin** aEnabledPlugin)
 {
   nsAutoString type;
   GetType(type);
 
-  PRBool disabled = PR_FALSE;
-
-  if (type.Length() == 1 && type.First() == '*') {
-    // Check if the default plugin is disabled.
-    disabled = nsContentUtils::GetBoolPref("plugin.default_plugin_disabled");
-  }
-
-  *aEnabledPlugin = disabled ? nsnull : mPlugin;
+  *aEnabledPlugin = mPlugin;
 
   NS_IF_ADDREF(*aEnabledPlugin);
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
 nsMimeType::GetSuffixes(nsAString& aSuffixes)
--- a/js/src/tests/e4x/Regress/regress-308111.js
+++ b/js/src/tests/e4x/Regress/regress-308111.js
@@ -508,17 +508,16 @@ var xml = <prefs>
 <pref><name>ui.key.menuAccessKeyFocuses</name></pref>
 <pref><name>plugin.scan.WindowsMediaPlayer</name></pref>
 <pref><name>font.name.cursive.x-western</name></pref>
 <pref><name>intl.charset.detector</name></pref>
 <pref><name>browser.download.save_converter_index</name></pref>
 <pref><name>image.animation_mode</name></pref>
 <pref><name>network.http.sendRefererHeader</name></pref>
 <pref><name>font.default.x-central-euro</name></pref>
-<pref><name>plugin.default_plugin_disabled</name></pref>
 <pref><name>network.protocol-handler.external.ms-help</name></pref>
 <pref><name>font.default.x-geor</name></pref>
 <pref><name>browser.download.manager.openDelay</name></pref>
 <pref><name>dom.disable_window_open_feature.personalbar</name></pref>
 <pref><name>capability.policy.mailnews.SOAPHeaderBlock.mustUnderstand</name></pref>
 <pref><name>intl.keyboard.per_window_layout</name></pref>
 <pref><name>network.dir.format</name></pref>
 <pref><name>capability.policy.default.Clipboard.cutcopy</name></pref>
--- a/testing/tests/memtest.py
+++ b/testing/tests/memtest.py
@@ -192,17 +192,16 @@ class Firefox_runner:
                 "}\n")
         p.close()
 
     def write_user_prefs(this):
         userprefs = open(os.path.join(this.profile_dir, "user.js"), "w")
         userprefs.write("user_pref(\"network.proxy.autoconfig_url\", \"file://%s\");\n" % this.proxypac)
         userprefs.write("user_pref(\"network.proxy.type\", 2);\n")
         userprefs.write("user_pref(\"privacy.popups.firstTime\", false);\n")
-        userprefs.write("user_pref(\"plugin.default_plugin_disabled\", false);\n")
         userprefs.write("user_pref(\"dom.max_script_run_time\", 0);\n")
         userprefs.write("user_pref(\"dom.max_script_run_time\", 0);\n")
         userprefs.write("user_pref(\"dom.allow_scripts_to_close_windows\", true);\n")
         userprefs.close()
 
     def perform_initial_registration(this):
         dummy_file = os.path.join(this.tmpdir, "dummy.html")
         f = open(dummy_file, "w")
--- a/toolkit/toolkit-makefiles.sh
+++ b/toolkit/toolkit-makefiles.sh
@@ -334,19 +334,16 @@ MAKEFILES_libsydneyaudio="
   media/libsydneyaudio/include/Makefile
   media/libsydneyaudio/src/Makefile
 "
 
 MAKEFILES_plugin="
   modules/plugin/Makefile
   modules/plugin/base/src/Makefile
   modules/plugin/base/public/Makefile
-  modules/plugin/default/mac/Makefile
-  modules/plugin/default/unix/Makefile
-  modules/plugin/default/windows/Makefile
   modules/plugin/sdk/Makefile
   modules/plugin/sdk/samples/Makefile
   modules/plugin/sdk/samples/common/Makefile
   modules/plugin/sdk/samples/basic/windows/Makefile
   modules/plugin/sdk/samples/winless/windows/Makefile
 "
 
 MAKEFILES_freetype2="