Bug 1688415 - Remove preferences for NPAPI. r=IanN

suite/app/profile/suite-prefs.js

@@ -783,10 +783,13 @@ pref("dom.identity.enabled", false);
 pref("dom.ipc.plugins.nativeCursorSupport", true);
 #endif
 
-pref("plugins.hide_infobar_for_outdated_plugin", false);
-pref("plugins.hide_infobar_for_missing_plugin", false);
-pref("plugins.click_to_play", true);
+pref("plugins.hide_infobar_for_outdated_plugin", true);
+pref("plugins.hide_infobar_for_missing_plugin", true);
+pref("plugins.click_to_play", false);
 pref("plugin.disable", false);
+pref("plugin.default.state", 0);
+pref("plugins.favorfallback.mode", "always");
+pref("plugins.favorfallback.rules", "nosrc,video");
 
 // Digital Rights Management, Encrypted Media Extensions
 pref("media.eme.enabled", false);
@@ -947,7 +950,6 @@ pref("services.sync.prefs.sync.mailnews.mark_message_read.auto", true);
 pref("services.sync.prefs.sync.mailnews.mark_message_read.delay", true);
 pref("services.sync.prefs.sync.mailnews.mark_message_read.delay.interval", true);
 pref("services.sync.prefs.sync.mailnews.messageid.openInNewWindow", true);
-pref("services.sync.prefs.sync.mailnews.message_display.allow_plugins", true);
 pref("services.sync.prefs.sync.mailnews.message_display.disable_remote_image", true);
 pref("services.sync.prefs.sync.mailnews.nav_crosses_folders", true);
 pref("services.sync.prefs.sync.mailnews.offline_sync_mail", true);
@@ -1035,12 +1037,6 @@ pref("security.sandbox.windows.log", false);
 // 3 - the strongest settings we seem to be able to use without breaking
 //     everything, but will probably cause some functionality restrictions
 pref("dom.ipc.plugins.sandbox-level.default", 0);
-#if defined(_AMD64_)
-// The lines in PluginModuleParent.cpp should be changed in line with this.
-pref("dom.ipc.plugins.sandbox-level.flash", 2);
-#else
-pref("dom.ipc.plugins.sandbox-level.flash", 0);
-#endif
 
 #if defined(MOZ_CONTENT_SANDBOX)
 // This controls the strength of the Windows content process sandbox for testing

suite/components/migration/src/nsThunderbirdProfileMigrator.cpp

@@ -350,7 +350,6 @@ nsThunderbirdProfileMigrator::PrefTransform gTransforms[] = {
   MAKESAMETYPEPREFTRANSFORM("mailnews.mark_message_read.delay",        Bool),
   MAKESAMETYPEPREFTRANSFORM("mailnews.mark_message_read.delay.interval", Int),
 
-  MAKESAMETYPEPREFTRANSFORM("mailnews.message_display.allow.plugins",  Bool),
   MAKESAMETYPEPREFTRANSFORM("mailnews.message_display.disable_remote_image", Bool),
 
   MAKESAMETYPEPREFTRANSFORM("mailnews.nav_crosses_folders",            Int),
@@ -410,8 +409,6 @@ nsThunderbirdProfileMigrator::PrefTransform gTransforms[] = {
   MAKESAMETYPEPREFTRANSFORM("offline.download.download_messages",      Int),
   MAKESAMETYPEPREFTRANSFORM("offline.send.unsent_messages",            Int),
   MAKESAMETYPEPREFTRANSFORM("offline.startup_state",                   Int),
-  MAKESAMETYPEPREFTRANSFORM("plugin.override_internal_types",          Bool),
-  MAKESAMETYPEPREFTRANSFORM("plugin.expose_full_path",                 Bool),
   MAKESAMETYPEPREFTRANSFORM("security.default_personal_cert",          String),
   MAKESAMETYPEPREFTRANSFORM("security.password_lifetime",              Int),
   MAKESAMETYPEPREFTRANSFORM("security.tls.version.min",                Int),

suite/components/pref/content/pref-scripts.xul

@@ -39,15 +39,6 @@
       <preference id="javascript.options.showInConsole"
                   name="javascript.options.showInConsole"
                   type="bool"/>
-      <preference id="plugin.disable"
-                  name="plugin.disable"
-                  type="bool" inverted="true"/>
-      <preference id="plugins.hide_infobar_for_missing_plugin"
-                  name="plugins.hide_infobar_for_missing_plugin"
-                  type="bool" inverted="true"/>
-      <preference id="plugin.default.state"
-                  name="plugin.default.state"
-                  type="int"/>
     </preferences>
 
     <groupbox id="javascriptPreferences" flex="1">
@@ -97,31 +88,5 @@
                 accesskey="&debugConsoleJavascript.accesskey;"
                 preference="javascript.options.showInConsole"/>
     </groupbox>
-
-    <groupbox id="pluginPreferences">
-      <caption label="&enablePlugins.label;"/>
-      <checkbox id="pluginForSuite"
-                label="&enablePluginForSuite.label;"
-                accesskey="&enablePluginForSuite.accesskey;"
-                preference="plugin.disable"/>
-
-      <!-- mailnews will add its checkbox here using overlay (mailPrefsOverlay.xul).
-      -->
-    </groupbox>
-
-    <groupbox id="pageRequiresPlugins">
-      <caption label="&whenPageRequiresPlugins.label;"/>
-      <checkbox id="activateAllPlugins"
-                label="&activateAllPlugins.label;"
-                accesskey="&activateAllPlugins.accesskey;"
-                preference="plugin.default.state"
-                onsyncfrompreference="return document.getElementById(this.getAttribute('preference')).value == 2;"
-                onsynctopreference="return this.checked ? 2 : 1;"/>
-      <checkbox id="warnPluginsRequired"
-                label="&warnPluginsRequired.label;"
-                accesskey="&warnPluginsRequired.accesskey;"
-                preference="plugins.hide_infobar_for_missing_plugin"/>
-    </groupbox>
-
   </prefpane>
 </overlay>

suite/locales/en-US/chrome/common/pref/pref-scripts.dtd

@@ -27,13 +27,3 @@
 <!ENTITY debugStrictJavascript.accesskey  "J">
 <!ENTITY debugConsoleJavascript.label     "Show chrome JavaScript errors and warnings">
 <!ENTITY debugConsoleJavascript.accesskey "c">
-
-<!ENTITY enablePlugins.label             "Enable Plugins for">
-<!ENTITY enablePluginForSuite.label      "Suite">
-<!ENTITY enablePluginForSuite.accesskey  "u">
-
-<!ENTITY whenPageRequiresPlugins.label   "When a page requires plugins">
-<!ENTITY activateAllPlugins.label        "Activate all plugins by default">
-<!ENTITY activateAllPlugins.accesskey    "d">
-<!ENTITY warnPluginsRequired.label       "Warn me if additional plugins need to be installed">
-<!ENTITY warnPluginsRequired.accesskey   "W">

suite/locales/en-US/chrome/mailnews/pref/mailPrefsOverlay.dtd

@@ -2,10 +2,6 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!-- These are added to the Advanced - Scripts & Plugins panel -->
-<!ENTITY enbPluginCheckMailNews.label     "Mail &amp; Newsgroups">
-<!ENTITY enbPluginCheckMailNews.accesskey "a">
-
 <!-- These are added to the Window menu -->
 <!ENTITY mail.label                       "Mail &amp; Newsgroups">
 <!ENTITY mail.accesskey                   "M">

suite/mailnews/components/prefs/content/mailPrefsOverlay.xul

@@ -20,22 +20,6 @@
                 name="general.startup.addressbook"
                 type="bool"/>
   </preferences>
-  <preferences id="scripts_preferences">
-    <preference id="plugin.disable"
-                onchange="setDisableState('pluginAllowMailNews', !this.value);"/>
-    <preference id="mailnews.message_display.allow.plugins"
-                name="mailnews.message_display.allow.plugins"
-                type="bool"/>
-  </preferences>
-  <!-- plugin toggle for mail/news -->
-  <groupbox id="pluginPreferences"
-            orient="horizontal">
-    <checkbox id="pluginAllowMailNews"
-              onsyncfrompreference="document.getElementById('scripts_pane').setDisableState(this.id, !document.getElementById('plugin.disable').value);"
-              label="&enbPluginCheckMailNews.label;"
-              accesskey="&enbPluginCheckMailNews.accesskey;"
-              preference="mailnews.message_display.allow.plugins"/>
-  </groupbox>
 
   <!-- mail startup toggle -->
   <groupbox id="generalStartupPreferences">

suite/mailnews/jar.mn

@@ -13,7 +13,6 @@ messenger.jar:
 % content messenger-region %content/messenger-region/
 % overlay chrome://communicator/content/pref/preferences.xul                   chrome://messenger/content/mailPrefsOverlay.xul
 % overlay chrome://communicator/content/pref/pref-appearance.xul               chrome://messenger/content/mailPrefsOverlay.xul
-% overlay chrome://communicator/content/pref/pref-scripts.xul                  chrome://messenger/content/mailPrefsOverlay.xul
 % overlay chrome://communicator/content/pref/pref-cookies.xul                  chrome://messenger/content/mailPrefsOverlay.xul
 % overlay chrome://editor/content/editorTasksOverlay.xul                       chrome://messenger/content/mailTasksOverlay.xul
 % overlay chrome://messenger/content/addressbook/abSelectAddressesDialog.xul   chrome://messenger/content/mailOverlay.xul