Bug 1833189 - Remove plugin.state.flash pref r=mossop,webdriver-revie…

…wers,perftest-reviewers,whimboo,afinder,emilio Differential Revision: https://phabricator.services.mozilla.com/D178089
dothq · May 26, 2023 · 98f6fcf · 98f6fcf
1 parent e8a0ebb
commit 98f6fcf
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 24 deletions.
diff --git a/dom/base/Document.cpp b/dom/base/Document.cpp
@@ -121,7 +121,6 @@
 #include "mozilla/StaticPrefs_layout.h"
 #include "mozilla/StaticPrefs_network.h"
 #include "mozilla/StaticPrefs_page_load.h"
-#include "mozilla/StaticPrefs_plugins.h"
 #include "mozilla/StaticPrefs_privacy.h"
 #include "mozilla/StaticPrefs_security.h"
 #include "mozilla/StaticPrefs_widget.h"

diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp
@@ -50,7 +50,6 @@
 #include "mozilla/StaticPrefs_dom.h"
 #include "mozilla/StaticPrefs_layout.h"
 #include "mozilla/StaticPrefs_mousewheel.h"
-#include "mozilla/StaticPrefs_plugin.h"
 #include "mozilla/StaticPrefs_ui.h"
 #include "mozilla/StaticPrefs_zoom.h"
 

diff --git a/dom/plugins/base/nsPluginTags.cpp b/dom/plugins/base/nsPluginTags.cpp
@@ -17,7 +17,6 @@
 #include <cctype>
 #include "mozilla/Encoding.h"
 #include "mozilla/dom/FakePluginTagInitBinding.h"
-#include "mozilla/StaticPrefs_plugin.h"
 
 using mozilla::dom::FakePluginTagInit;
 using namespace mozilla;

diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
@@ -12888,20 +12888,6 @@
   value: true
   mirror: always
 
-#---------------------------------------------------------------------------
-# Prefs starting with "plugin."
-#---------------------------------------------------------------------------
-
-- name: plugin.state.flash
-  type: uint32_t
-  # Flash is Click-to-Activate by default on all channels. Disabled for ARM builds.
-#if defined(_ARM64_) && defined(XP_WIN)
-  value: 0
-#else
-  value: 1
-#endif
-  mirror: always
-
 #---------------------------------------------------------------------------
 # Prefs starting with "plugins."
 #---------------------------------------------------------------------------

diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build
@@ -72,7 +72,6 @@ pref_groups = [
     "permissions",
     "places",
     "plain_text",
-    "plugin",
     "plugins",
     "preferences",
     "print",

diff --git a/testing/geckodriver/src/prefs.rs b/testing/geckodriver/src/prefs.rs
@@ -118,11 +118,6 @@ lazy_static! {
         // Make sure SNTP requests do not hit the network
         ("network.sntp.pools", Pref::new("%(server)s")),
 
-        // Disable Flash.  The plugin container it is run in is
-        // causing problems when quitting Firefox from geckodriver,
-        // c.f. https://github.com/mozilla/geckodriver/issues/225.
-        ("plugin.state.flash", Pref::new(0)),
-
         // Don't do network connections for mitm priming
         ("security.certerrors.mitm.priming.enabled", Pref::new(false)),
 

diff --git a/testing/profiles/perf/user.js b/testing/profiles/perf/user.js
@@ -71,7 +71,6 @@ user_pref("media.peerconnection.enabled", true);
 // relatively long time which may cause unnecessary intermittents and slow down
 // tests. This, like many things, will stop working correctly in 2038.
 user_pref("places.database.lastMaintenance", 2147483647);
-user_pref("plugin.state.flash", 0);
 user_pref("privacy.reduceTimerPrecision", false); // Bug 1445243 - reduces precision of tests
 user_pref("privacy.trackingprotection.annotate_channels", false);
 user_pref("privacy.trackingprotection.enabled", false);