Bug 1549855 - remove references to e10s force-enable pref that is no longer used, r=ato,snorp,eeejay
☠☠ backed out by 440aa7a30693 ☠ ☠
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Thu, 16 May 2019 16:21:56 +0000
changeset 474202 928038c23227504c1cd7dff5f5e214501bb4b688
parent 474201 9383ea5938fe62e6d29fb9ebb143b304b9070529
child 474203 2c3426c424110085bff92c2ffdb2fe4372c98cca
push id36027
push usershindli@mozilla.com
push dateFri, 17 May 2019 16:24:38 +0000
treeherdermozilla-central@c94c54aff466 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato, snorp, eeejay
bugs1549855
milestone68.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1549855 - remove references to e10s force-enable pref that is no longer used, r=ato,snorp,eeejay Differential Revision: https://phabricator.services.mozilla.com/D31417
accessible/tests/browser/head.js
mobile/android/chrome/content/browser.js
testing/marionette/harness/marionette_harness/runner/base.py
testing/marionette/harness/marionette_harness/tests/harness_unit/test_marionette_runner.py
--- a/accessible/tests/browser/head.js
+++ b/accessible/tests/browser/head.js
@@ -10,18 +10,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]
+        ["browser.tabs.remote.autostart", true]
       ]
     }, resolve));
 }
 
 /**
  * Unset e10s related preferences in the test environment.
  * @return {Promise} promise that resolves when preferences are unset.
  */
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -3614,17 +3614,17 @@ Tab.prototype = {
       return;
 
     aParams = aParams || {};
 
     this.browser = document.createElement("browser");
     this.browser.setAttribute("type", "content");
     this.browser.setAttribute("messagemanagergroup", "browsers");
 
-    if (Preferences.get("browser.tabs.remote.force-enable", false)) {
+    if (Preferences.get("browser.tabs.remote.autostart", false)) {
       this.browser.setAttribute("remote", "true");
     }
 
     this.browser.permanentKey = {};
 
     // Check if we have a "parent" window which we need to set as our opener
     if ("opener" in aParams) {
       this.browser.presetOpenerWindow(aParams.opener);
--- a/testing/marionette/harness/marionette_harness/runner/base.py
+++ b/testing/marionette/harness/marionette_harness/runner/base.py
@@ -566,17 +566,16 @@ class BaseMarionetteTestRunner(object):
         # self.e10s stores the desired configuration, whereas
         # 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,
             })
 
         # 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
@@ -453,17 +453,16 @@ 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,
     }
     for k,v in e10s_prefs.iteritems():
         assert runner.prefs.get(k, False) == (v and e10s)
 
 
 def test_option_e10s_clash_raises(mock_runner):
     mock_runner._e10s_from_browser = False