Bug 1406212 - Remove references to extensions.e10sBlocksEnabling. r=Felipe draft
authorBlake Kaplan <mrbkap@gmail.com>
Mon, 16 Oct 2017 13:52:48 -0700
changeset 682787 a5bf4207a0ec5ebaf3af24df800bb26cc6e063a9
parent 682786 54da187ad8b1df8474ecd9ffdaf86a527ac2fad3
child 682788 2d2dbf0706e660fdad4f69ecfb7db2e4ebd7b60a
push id85144
push userbmo:mrbkap@mozilla.com
push dateWed, 18 Oct 2017 18:39:48 +0000
reviewersFelipe
bugs1406212
milestone58.0a1
Bug 1406212 - Remove references to extensions.e10sBlocksEnabling. r=Felipe MozReview-Commit-ID: 11q3Go0IkPh
accessible/tests/browser/head.js
browser/app/profile/firefox.js
python/mozbuild/mozbuild/test/codecoverage/test_lcov_rewrite.py
testing/geckodriver/src/prefs.rs
testing/marionette/client/marionette_driver/geckoinstance.py
testing/marionette/doc/api/server.js.html
testing/marionette/harness/marionette_harness/runner/base.py
testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_runner.py
testing/marionette/server.js
testing/profiles/prefs_general.js
testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json
testing/talos/talos/config.py
testing/talos/talos/mtio-whitelist.json
toolkit/xre/nsAppRunner.cpp
--- a/accessible/tests/browser/head.js
+++ b/accessible/tests/browser/head.js
@@ -11,18 +11,17 @@
  * Set e10s related preferences in the test environment.
  * @return {Promise} promise that resolves when preferences are set.
  */
 function setE10sPrefs() {
   return new Promise(resolve =>
     SpecialPowers.pushPrefEnv({
       set: [
         ["browser.tabs.remote.autostart", true],
-        ["browser.tabs.remote.force-enable", true],
-        ["extensions.e10sBlocksEnabling", false]
+        ["browser.tabs.remote.force-enable", true]
       ]
     }, resolve));
 }
 
 /**
  * Unset e10s related preferences in the test environment.
  * @return {Promise} promise that resolves when preferences are unset.
  */
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1575,22 +1575,16 @@ pref("extensions.interposition.prefetchi
 
 // But don't allow non-MPC extensions by default on Nightly
 #if defined(NIGHTLY_BUILD)
 pref("extensions.allow-non-mpc-extensions", false);
 #endif
 
 pref("extensions.legacy.enabled", false);
 
-// Enable blocking of e10s and e10s-multi for add-on users on beta/release.
-#if defined(RELEASE_OR_BETA) && !defined(MOZ_DEV_EDITION)
-pref("extensions.e10sBlocksEnabling", true);
-pref("extensions.e10sMultiBlocksEnabling", true);
-#endif
-
 // How often to check for CPOW timeouts. CPOWs are only timed out by
 // the hang monitor.
 pref("dom.ipc.cpow.timeout", 500);
 
 // Causes access on unsafe CPOWs from browser code to throw by default.
 pref("dom.ipc.cpows.forbid-unsafe-from-browser", true);
 
 // Don't allow add-ons marked as multiprocessCompatible to use CPOWs.
--- a/python/mozbuild/mozbuild/test/codecoverage/test_lcov_rewrite.py
+++ b/python/mozbuild/mozbuild/test/codecoverage/test_lcov_rewrite.py
@@ -265,20 +265,16 @@ class TestUrlFinder(unittest.TestCase):
                 'dist/bin/components/MainProcessSingleton.js': [
                     'path1',
                     False
                 ],
                 'dist/bin/browser/components/nsSessionStartup.js': [
                     'path2',
                     False
                 ],
-                'dist/bin/browser/features/e10srollout@mozilla.org/bootstrap.js': [
-                    'path3',
-                    False
-                ],
                 'dist/bin/browser/features/firefox@getpocket.com/bootstrap.js': [
                     'path4',
                     False
                 ],
                 'dist/xpi-stage/workerbootstrap/bootstrap.js': [
                     'path5',
                     False
                 ]
@@ -293,17 +289,16 @@ class TestUrlFinder(unittest.TestCase):
 
     def test_jar_paths(self):
         app_name = buildconfig.substs.get('MOZ_APP_NAME')
         omnijar_name = buildconfig.substs.get('OMNIJAR_NAME')
 
         paths = [
             ('jar:file:///home/worker/workspace/build/application/' + app_name + '/' + omnijar_name + '!/components/MainProcessSingleton.js', 'path1'),
             ('jar:file:///home/worker/workspace/build/application/' + app_name + '/browser/' + omnijar_name + '!/components/nsSessionStartup.js', 'path2'),
-            ('jar:file:///home/worker/workspace/build/application/' + app_name + '/browser/features/e10srollout@mozilla.org.xpi!/bootstrap.js', 'path3'),
             ('jar:file:///home/worker/workspace/build/application/' + app_name + '/browser/features/firefox@getpocket.com.xpi!/bootstrap.js', 'path4'),
             ('jar:file:///tmp/tmpMdo5gV.mozrunner/extensions/workerbootstrap-test@mozilla.org.xpi!/bootstrap.js', 'path5'),
         ]
 
         url_finder = lcov_rewriter.UrlFinder('', '', [])
         for path, expected in paths:
             self.assertEqual(url_finder.rewrite_url(path)[0], expected)
 
--- a/testing/geckodriver/src/prefs.rs
+++ b/testing/geckodriver/src/prefs.rs
@@ -1,12 +1,12 @@
 use mozprofile::preferences::Pref;
 
 lazy_static! {
-    pub static ref DEFAULT: [(&'static str, Pref); 82] = [
+    pub static ref DEFAULT: [(&'static str, Pref); 81] = [
         // Disable automatic downloading of new releases
         ("app.update.auto", Pref::new(false)),
 
         // Disable automatically upgrading Firefox
         ("app.update.enabled", Pref::new(false)),
 
         // Increase the APZ content response timeout in tests to 1
         // minute.  This is to accommodate the fact that test environments
@@ -141,19 +141,16 @@ lazy_static! {
         ("dom.max_chrome_script_run_time", Pref::new(0)),
         ("dom.max_script_run_time", Pref::new(0)),
 
         // Only load extensions from the application and user profile
         // AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION
         ("extensions.autoDisableScopes", Pref::new(0)),
         ("extensions.enabledScopes", Pref::new(5)),
 
-        // don't block add-ons for e10s
-        ("extensions.e10sBlocksEnabling", Pref::new(false)),
-
         // Disable metadata caching for installed add-ons by default
         ("extensions.getAddons.cache.enabled", Pref::new(false)),
 
         // Disable intalling any distribution extensions or add-ons
         ("extensions.installDistroAddons", Pref::new(false)),
 
         // Make sure Shield doesn't hit the network.
         ("extensions.shield-recipe-client.api_url", Pref::new("")),
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -37,18 +37,16 @@ class GeckoInstance(object):
         # No slow script dialogs
         "dom.max_chrome_script_run_time": 0,
         "dom.max_script_run_time": 0,
 
         # Only load extensions from the application and user profile
         # AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION
         "extensions.autoDisableScopes": 0,
         "extensions.enabledScopes": 5,
-        # don't block add-ons for e10s
-        "extensions.e10sBlocksEnabling": False,
         # Disable metadata caching for installed add-ons by default
         "extensions.getAddons.cache.enabled": False,
         # Disable intalling any distribution add-ons
         "extensions.installDistroAddons": False,
         # Make sure Shield doesn't hit the network.
         "extensions.shield-recipe-client.api_url": "",
         "extensions.showMismatchUI": False,
         # Turn off extension updates so they don't bother tests
--- a/testing/marionette/doc/api/server.js.html
+++ b/testing/marionette/doc/api/server.js.html
@@ -231,19 +231,16 @@ const RECOMMENDED_PREFS = new Map([
 
   // Only load extensions from the application and user profile
   // AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION
   //
   // Should be set in profile.
   ["extensions.autoDisableScopes", 0],
   ["extensions.enabledScopes", 5],
 
-  // Do not block add-ons for e10s
-  ["extensions.e10sBlocksEnabling", false],
-
   // Disable metadata caching for installed add-ons by default
   ["extensions.getAddons.cache.enabled", false],
 
   // Disable installing any distribution extensions or add-ons.
   // Should be set in profile.
   ["extensions.installDistroAddons", false],
 
   // Make sure Shield doesn't hit the network.
--- a/testing/marionette/harness/marionette_harness/runner/base.py
+++ b/testing/marionette/harness/marionette_harness/runner/base.py
@@ -562,17 +562,16 @@ class BaseMarionetteTestRunner(object):
         # self._e10s_from_browser is the cached value from querying e10s
         # in self.is_e10s
         self.e10s = e10s
         self._e10s_from_browser = None
         if self.e10s:
             self.prefs.update({
                 'browser.tabs.remote.autostart': True,
                 'browser.tabs.remote.force-enable': True,
-                'extensions.e10sBlocksEnabling': False,
             })
 
         # If no repeat has been set, default to 30 extra runs
         if self.run_until_failure and repeat is None:
             self.repeat = 30
 
         def gather_debug(test, status):
             # No screenshots and page source for skipped tests
--- a/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_runner.py
+++ b/testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_runner.py
@@ -450,21 +450,18 @@ def test_catch_invalid_test_names(runner
 
 @pytest.mark.parametrize('e10s', (True, False))
 def test_option_e10s_sets_prefs(mach_parsed_kwargs, e10s):
     mach_parsed_kwargs['e10s'] = e10s
     runner = MarionetteTestRunner(**mach_parsed_kwargs)
     e10s_prefs = {
         'browser.tabs.remote.autostart': True,
         'browser.tabs.remote.force-enable': True,
-        'extensions.e10sBlocksEnabling': False
     }
     for k,v in e10s_prefs.iteritems():
-        if k == 'extensions.e10sBlocksEnabling' and not e10s:
-            continue
         assert runner.prefs.get(k, False) == (v and e10s)
 
 
 def test_option_e10s_clash_raises(mock_runner):
     mock_runner._e10s_from_browser = False
 
     with pytest.raises(AssertionError) as e:
         mock_runner.run_tests([u'test_fake_thing.py'])
--- a/testing/marionette/server.js
+++ b/testing/marionette/server.js
@@ -205,19 +205,16 @@ const RECOMMENDED_PREFS = new Map([
 
   // Only load extensions from the application and user profile
   // AddonManager.SCOPE_PROFILE + AddonManager.SCOPE_APPLICATION
   //
   // Should be set in profile.
   ["extensions.autoDisableScopes", 0],
   ["extensions.enabledScopes", 5],
 
-  // Do not block add-ons for e10s
-  ["extensions.e10sBlocksEnabling", false],
-
   // Disable metadata caching for installed add-ons by default
   ["extensions.getAddons.cache.enabled", false],
 
   // Disable installing any distribution extensions or add-ons.
   // Should be set in profile.
   ["extensions.installDistroAddons", false],
 
   // Make sure Shield doesn't hit the network.
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -342,19 +342,16 @@ user_pref("media.autoplay.enabled", true
 
 // Don't use auto-enabled e10s
 user_pref("browser.tabs.remote.autostart", false);
 // Don't show a delay when hiding the audio indicator during tests
 user_pref("browser.tabs.delayHidingAudioPlayingIconMS", 0);
 // Don't forceably kill content processes after a timeout
 user_pref("dom.ipc.tabs.shutdownTimeoutSecs", 0);
 
-// Don't block add-ons for e10s
-user_pref("extensions.e10sBlocksEnabling", false);
-
 // Make tests run consistently on DevEdition (which has a lightweight theme
 // selected by default).
 user_pref("lightweightThemes.selectedThemeID", "");
 
 // Enable speech synth test service, and disable built in platform services.
 user_pref("media.webspeech.synth.test", true);
 
 // Turn off search suggestions in the location bar so as not to trigger network
--- a/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json
+++ b/testing/runtimes/mochitest-browser-chrome-e10s.runtimes.json
@@ -562,17 +562,16 @@
     "browser/components/preferences/in-content-new/tests/browser_connection_bug388287.js": 5029,
     "browser/components/preferences/in-content-new/tests/browser_cookies_dialog.js": 3184,
     "browser/components/preferences/in-content-new/tests/browser_cookies_exceptions.js": 32201,
     "browser/components/preferences/in-content-new/tests/browser_defaultbrowser_alwayscheck.js": 4635,
     "browser/components/preferences/in-content-new/tests/browser_homepages_filter_aboutpreferences.js": 3838,
     "browser/components/preferences/in-content-new/tests/browser_layersacceleration.js": 2508,
     "browser/components/preferences/in-content-new/tests/browser_password_management.js": 2994,
     "browser/components/preferences/in-content-new/tests/browser_performance.js": 13789,
-    "browser/components/preferences/in-content-new/tests/browser_performance_e10srollout.js": 8605,
     "browser/components/preferences/in-content-new/tests/browser_permissions_dialog.js": 6297,
     "browser/components/preferences/in-content-new/tests/browser_permissions_urlFieldHidden.js": 2995,
     "browser/components/preferences/in-content-new/tests/browser_privacypane_1.js": 16697,
     "browser/components/preferences/in-content-new/tests/browser_privacypane_3.js": 16474,
     "browser/components/preferences/in-content-new/tests/browser_privacypane_4.js": 27807,
     "browser/components/preferences/in-content-new/tests/browser_privacypane_5.js": 16543,
     "browser/components/preferences/in-content-new/tests/browser_privacypane_8.js": 16470,
     "browser/components/preferences/in-content-new/tests/browser_proxy_backup.js": 2928,
@@ -602,17 +601,16 @@
     "browser/components/preferences/in-content/tests/browser_bug1020245_openPreferences_to_paneContent.js": 6134,
     "browser/components/preferences/in-content/tests/browser_bug1184989_prevent_scrolling_when_preferences_flipped.js": 2822,
     "browser/components/preferences/in-content/tests/browser_bug731866.js": 2580,
     "browser/components/preferences/in-content/tests/browser_connection_bug388287.js": 4074,
     "browser/components/preferences/in-content/tests/browser_cookies_exceptions.js": 21992,
     "browser/components/preferences/in-content/tests/browser_defaultbrowser_alwayscheck.js": 2650,
     "browser/components/preferences/in-content/tests/browser_homepages_filter_aboutpreferences.js": 2711,
     "browser/components/preferences/in-content/tests/browser_performance.js": 8337,
-    "browser/components/preferences/in-content/tests/browser_performance_e10srollout.js": 6055,
     "browser/components/preferences/in-content/tests/browser_permissions_dialog.js": 3857,
     "browser/components/preferences/in-content/tests/browser_permissions_urlFieldHidden.js": 3673,
     "browser/components/preferences/in-content/tests/browser_privacypane_1.js": 11424,
     "browser/components/preferences/in-content/tests/browser_privacypane_3.js": 9253,
     "browser/components/preferences/in-content/tests/browser_privacypane_4.js": 15706,
     "browser/components/preferences/in-content/tests/browser_privacypane_5.js": 9661,
     "browser/components/preferences/in-content/tests/browser_privacypane_8.js": 9127,
     "browser/components/preferences/in-content/tests/browser_sanitizeOnShutdown_prefLocked.js": 2922,
@@ -1114,9 +1112,9 @@
     "toolkit/mozapps/update/tests/browser/browser_TelemetryUpdatePing.js": 2499,
     "toolkit/mozapps/update/tests/browser/browser_updatesBackgroundWindow.js": 3227,
     "toolkit/mozapps/update/tests/browser/browser_updatesBackgroundWindowFailures.js": 3956,
     "toolkit/mozapps/update/tests/browser/browser_updatesCompleteAndPartialPatchesWithBadSizes.js": 3131,
     "toolkit/mozapps/update/tests/browser/browser_updatesDownloadFailures.js": 3094,
     "uriloader/exthandler/tests/mochitest/browser_auto_close_window.js": 8318,
     "uriloader/exthandler/tests/mochitest/browser_web_protocol_handlers.js": 3133
   }
-}
\ No newline at end of file
+}
--- a/testing/talos/talos/config.py
+++ b/testing/talos/talos/config.py
@@ -288,17 +288,16 @@ def set_webserver(config):
     config['webserver'] = 'localhost:%d' % port
 
 
 @validator
 def update_prefs(config):
     # if e10s is enabled, set prefs accordingly
     if config['e10s']:
         config['preferences']['browser.tabs.remote.autostart'] = True
-        config['preferences']['extensions.e10sBlocksEnabling'] = False
     else:
         config['preferences']['browser.tabs.remote.autostart'] = False
 
     # update prefs from command line
     prefs = config.pop('extraPrefs')
     if prefs:
         for arg in prefs:
             k, v = arg.split('=', 1)
--- a/testing/talos/talos/mtio-whitelist.json
+++ b/testing/talos/talos/mtio-whitelist.json
@@ -143,24 +143,21 @@
  "{xre}\\browser\\features\\screenshots@mozilla.org.xpi": {},
  "{xre}\\browser\\features\\followonsearch@mozilla.com.xpi\\manifest.json": {},
  "{xre}\\browser\\features\\activity-stream@mozilla.org.xpi\\manifest.json": {},
  "{xre}\\browser\\features\\shield-recipe-client@mozilla.org.xpi\\manifest.json": {},
  "{xre}\\browser\\features\\firefox@getpocket.com.xpi\\manifest.json": {},
  "{xre}\\browser\\features\\webcompat-reporter@mozilla.org.xpi\\install.rdf": {},
  "{xre}\\browser\\features\\webcompat@mozilla.org.xpi\\manifest.json": {},
  "{xre}\\browser\\features\\aushelper@mozilla.org.xpi": {},
- "{xre}\\browser\\features\\e10srollout@mozilla.org.xpi\\install.rdf": {},
  "{xre}\\browser\\features\\presentation@mozilla.org.xpi\\manifest.json": {},
- "{xre}\\browser\\features\\e10srollout@mozilla.org.xpi\\manifest.json": {},
  "{xre}\\browser\\features\\clicktoplay-rollout@mozilla.org.xpi\\install.rdf": {},
  "{xre}\\browser\\features\\webcompat-reporter@mozilla.org.xpi\\manifest.json": {},
  "{xre}\\browser\\features\\aushelper@mozilla.org.xpi\\install.rdf": {},
  "{xre}\\browser\\features\\firefox@getpocket.com.xpi": {},
- "{xre}\\browser\\features\\e10srollout@mozilla.org.xpi": {},
  "{xre}\\browser\\features\\flyweb@mozilla.org.xpi\\install.rdf": {},
  "{xre}\\browser\\features\\presentation@mozilla.org.xpi": {},
  "{xre}\\browser\\features\\aushelper@mozilla.org.xpi\\manifest.json": {},
  "{xre}\\browser\\features\\followonsearch@mozilla.com.xpi": {},
  "{xre}\\browser\\features\\activity-stream@mozilla.org.xpi": {},
  "{xre}\\browser\\features\\screenshots@mozilla.org.xpi\\install.rdf": {},
  "{xre}\\browser\\features\\webcompat@mozilla.org.xpi": {},
  "{xre}\\browser\\features\\webcompat-reporter@mozilla.org.xpi": {},
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -5086,17 +5086,17 @@ XRE_UseNativeEventProcessing()
 enum {
   kE10sEnabledByUser = 0,
   kE10sEnabledByDefault = 1,
   kE10sDisabledByUser = 2,
   // kE10sDisabledInSafeMode = 3, was removed in bug 1172491.
   // kE10sDisabledForAccessibility = 4,
   // kE10sDisabledForMacGfx = 5, was removed in bug 1068674.
   // kE10sDisabledForBidi = 6, removed in bug 1309599
-  kE10sDisabledForAddons = 7,
+  // kE10sDisabledForAddons = 7, removed in bug 1406212
   kE10sForceDisabled = 8,
   // kE10sDisabledForXPAcceleration = 9, removed in bug 1296353
   // kE10sDisabledForOperatingSystem = 10, removed due to xp-eol
 };
 
 const char* kForceEnableE10sPref = "browser.tabs.remote.force-enable";
 const char* kForceDisableE10sPref = "browser.tabs.remote.force-disable";