Backed out changeset 887d125d7f59 (bug 1578709) for failing at test_bug427744.html on a CLOSED TREE.

browser/base/content/test/contextMenu/browser.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-prefs =
-  plugin.load_flash_only=false
 support-files =
   subtst_contextmenu_webext.html
   test_contextmenu_links.html

browser/base/content/test/general/browser.ini

@@ -6,9 +6,7 @@
 ###############################################################################
 
 [DEFAULT]
-prefs =
-  browser.cache.offline.insecure.enable=true
-  plugin.load_flash_only=false # for plugin usage in browser_tab_dragdrop.js
+prefs = browser.cache.offline.insecure.enable=true
 support-files =
   alltabslistener.html
   app_bug575561.html

browser/base/content/test/plugins/browser-rs-blocklist.ini

@@ -7,9 +7,7 @@
 # manifests. Sorry!
 [DEFAULT]
 dupe-manifest =
-prefs =
-  extensions.blocklist.useXML=false
-  plugin.load_flash_only=false
+prefs = extensions.blocklist.useXML=false
 tags = blocklist rsblock
 support-files =
   blocklist_proxy.js

browser/base/content/test/plugins/browser.ini

@@ -7,9 +7,7 @@
 # manifests. Sorry!
 [DEFAULT]
 dupe-manifest =
-prefs =
-  extensions.blocklist.useXML=true
-  plugin.load_flash_only=false
+prefs = extensions.blocklist.useXML=true
 support-files =
   blocklist_proxy.js
   blockNoPlugins.xml

browser/components/extensions/test/browser/browser.ini

@@ -6,7 +6,6 @@ prefs =
     dom.ipc.keepProcessesAlive.extension=1
     dom.animations-api.core.enabled=true
     dom.animations-api.timelines.enabled=true
-    plugin.load_flash_only=false
 support-files =
   head.js
   head_devtools.js

dom/base/test/browser.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-prefs =
-  plugin.load_flash_only=false
 support-files =
   audio.ogg
   dummy.html

dom/base/test/mochitest.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-prefs =
-  plugin.load_flash_only=false
 support-files =
   audio.ogg
   audioEndedDuringPlaying.webm

dom/html/test/mochitest.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-prefs =
-  plugin.load_flash_only=false
 support-files =
   347174transform.xsl
   347174transformable.xml

dom/plugins/test/mochitest/browser.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-prefs =
-  plugin.load_flash_only=false
 support-files =
   head.js
   plugin_data_url_test.html

dom/plugins/test/mochitest/chrome.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-prefs =
-  plugin.load_flash_only=false
 support-files =
   hang_test.js
   privatemode_perwindowpb.xul

dom/plugins/test/mochitest/mochitest.ini

@@ -1,7 +1,5 @@
 [DEFAULT]
 tags = clipboard
-prefs =
-  plugin.load_flash_only=false
 skip-if = headless # crash on shutdown, no other failures
 support-files =
   307-xo-redirect.sjs

dom/security/test/mixedcontentblocker/mochitest.ini

@@ -1,7 +1,6 @@
 [DEFAULT]
 tags = mcb
 prefs =
-  plugin.load_flash_only=false
   security.mixed_content.upgrade_display_content=false
 support-files =
   file_bug803225_test_mailto.html

dom/serviceworkers/test/mochitest.ini

@@ -6,7 +6,6 @@
 # use cookieBehavior 0 (BEHAVIOR_ACCEPT) here.
 prefs =
   network.cookie.cookieBehavior=0
-  plugin.load_flash_only=false
 support-files =
   worker.js
   worker2.js

dom/tests/mochitest/bugs/mochitest.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-prefs =
-  plugin.load_flash_only=false
 support-files =
   bug289714.sjs
   bug346659-echoer.html

layout/base/tests/chrome/chrome.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-prefs =
-  plugin.load_flash_only=false
 skip-if = os == 'android'
 support-files =
   animated.gif

layout/base/tests/mochitest.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-prefs =
-  plugin.load_flash_only=false
 support-files =
   Ahem.ttf
   file_bug842853.html

layout/generic/test/mochitest.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-prefs =
-  plugin.load_flash_only=false
 skip-if = toolkit == 'android' #CRASH_DUMP, RANDOM, ONLY IN CHUNK 10
 support-files =
   ../../reftests/backgrounds/blue-32x32.png

testing/mochitest/chrome/chrome.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-prefs =
-  plugin.load_flash_only=false
 skip-if = os == 'android'
 support-files = test-dir/test-file
 

testing/mochitest/runtests.py

@@ -1941,10 +1941,6 @@ toolbar#nav-bar {
             "marionette.log.level": "Trace",
         }
 
-        # Ideally we should set this in a manifest, but a11y tests do not run by manifest.
-        if options.flavor == 'a11y':
-            prefs["plugin.load_flash_only"] = False
-
         if options.flavor == 'browser' and options.timeout:
             prefs["testing.browserTestHarness.timeout"] = options.timeout
 

testing/profiles/unittest-features/user.js

@@ -35,3 +35,7 @@ user_pref("extensions.formautofill.available", "on");
 user_pref("layout.css.clip-path-path.enabled", true);
 // Enable visualviewport for testing
 user_pref("dom.visualviewport.enabled", true);
+
+// For Firefox 52 only, ESR will support non-Flash plugins while release will
+// not, so we keep testing the non-Flash pathways
+user_pref("plugin.load_flash_only", false);

toolkit/content/tests/browser/browser.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-prefs =
-  plugin.load_flash_only=false
 support-files =
   almostSilentAudioTrack.webm
   audio.ogg

toolkit/forgetaboutsite/test/browser/browser.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-prefs =
-  plugin.load_flash_only=false
 support-files = browser_clearplugindata.html
 
 [browser_clearplugindata.js]

toolkit/mozapps/extensions/test/browser/browser.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-prefs =
-  plugin.load_flash_only=false
 tags = addons
 support-files =
   addons/browser_dragdrop1.xpi

widget/tests/chrome.ini

@@ -1,6 +1,4 @@
 [DEFAULT]
-prefs =
-  plugin.load_flash_only=false
 skip-if = os == 'android'
 support-files =
   empty_window.xul