Bug 1406212 - Remove browser.tabs.remote.autostart.N. r=Felipe

These are no longer needed.

MozReview-Commit-ID: C49R7GsWPDg

--HG--
extra : rebase_source : 9609ad56d497b59d530434d135692e454d4f772a

browser/app/profile/firefox.js

@@ -1544,14 +1544,6 @@ pref("privacy.userContext.extension", "");
 pref("browser.tabs.remote.autostart", true);
 pref("browser.tabs.remote.desktopbehavior", true);
 
-#if !defined(RELEASE_OR_BETA) || defined(MOZ_DEV_EDITION)
-// At the moment, autostart.2 is used, while autostart.1 is unused.
-// We leave it here set to false to reset users' defaults and allow
-// us to change everybody to true in the future, when desired.
-pref("browser.tabs.remote.autostart.1", false);
-pref("browser.tabs.remote.autostart.2", true);
-#endif
-
 // For speculatively warming up tabs to improve perceived
 // performance while using the async tab switcher.
 // Disabled until bug 1397426 is fixed.

browser/components/preferences/in-content/main.js

@@ -325,10 +325,9 @@ var gMainPane = {
       let e10sCheckbox = document.getElementById("e10sAutoStart");
 
       let e10sPref = document.getElementById("browser.tabs.remote.autostart");
-      let e10sTempPref = document.getElementById("e10sTempPref");
       let e10sForceEnable = document.getElementById("e10sForceEnable");
 
-      let preffedOn = e10sPref.value || e10sTempPref.value || e10sForceEnable.value;
+      let preffedOn = e10sPref.value || e10sForceEnable.value;
 
       if (preffedOn) {
         // The checkbox is checked if e10s is preffed on and enabled.
@@ -565,7 +564,6 @@ var gMainPane = {
     if (AppConstants.E10S_TESTING_ONLY) {
       let e10sCheckbox = document.getElementById("e10sAutoStart");
       let e10sPref = document.getElementById("browser.tabs.remote.autostart");
-      let e10sTempPref = document.getElementById("e10sTempPref");
 
       let prefsToChange;
       if (e10sCheckbox.checked) {
@@ -574,9 +572,6 @@ var gMainPane = {
       } else {
         // Disabling e10s autostart
         prefsToChange = [e10sPref];
-        if (e10sTempPref.value) {
-          prefsToChange.push(e10sTempPref);
-        }
       }
 
       let buttonIndex = confirmRestartPrompt(e10sCheckbox.checked, 0,
@@ -590,7 +585,7 @@ var gMainPane = {
       }
 
       // Revert the checkbox in case we didn't quit
-      e10sCheckbox.checked = e10sPref.value || e10sTempPref.value;
+      e10sCheckbox.checked = e10sPref.value;
     }
   },
 

browser/components/preferences/in-content/main.xul

@@ -22,9 +22,6 @@
     <preference id="browser.tabs.remote.autostart"
                 name="browser.tabs.remote.autostart"
                 type="bool"/>
-    <preference id="e10sTempPref"
-                name="browser.tabs.remote.autostart.2"
-                type="bool"/>
     <preference id="e10sForceEnable"
                 name="browser.tabs.remote.force-enable"
                 type="bool"/>

layout/tools/reftest/reftest-preferences.js

@@ -122,8 +122,7 @@ user_pref("extensions.autoDisableScopes", 0);
 user_pref("xpinstall.signatures.required", false);
 
 // Don't use auto-enabled e10s
-user_pref("browser.tabs.remote.autostart.1", false);
-user_pref("browser.tabs.remote.autostart.2", false);
+user_pref("browser.tabs.remote.autostart", false);
 
 user_pref("startup.homepage_welcome_url", "");
 user_pref("startup.homepage_welcome_url.additional", "");

testing/marionette/client/marionette_driver/geckoinstance.py

@@ -308,8 +308,6 @@ class FennecInstance(GeckoInstance):
         "browser.sessionstore.resume_from_crash": False,
 
         # Disable e10s by default
-        "browser.tabs.remote.autostart.1": False,
-        "browser.tabs.remote.autostart.2": False,
         "browser.tabs.remote.autostart": False,
 
         # Do not allow background tabs to be zombified, otherwise for tests that
@@ -453,8 +451,6 @@ class DesktopInstance(GeckoInstance):
         "browser.shell.checkDefaultBrowser": False,
 
         # Disable e10s by default
-        "browser.tabs.remote.autostart.1": False,
-        "browser.tabs.remote.autostart.2": False,
         "browser.tabs.remote.autostart": False,
 
         # Needed for branded builds to prevent opening a second tab on startup

testing/profiles/prefs_general.js

@@ -341,8 +341,7 @@ user_pref("media.eme.chromium-api.video-shmems", 0);
 user_pref("media.autoplay.enabled", true);
 
 // Don't use auto-enabled e10s
-user_pref("browser.tabs.remote.autostart.1", false);
-user_pref("browser.tabs.remote.autostart.2", false);
+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

testing/talos/talos/config.py

@@ -296,8 +296,6 @@ def update_prefs(config):
         config['preferences']['extensions.e10sBlocksEnabling'] = False
     else:
         config['preferences']['browser.tabs.remote.autostart'] = False
-        config['preferences']['browser.tabs.remote.autostart.1'] = False
-        config['preferences']['browser.tabs.remote.autostart.2'] = False
 
     # update prefs from command line
     prefs = config.pop('extraPrefs')

toolkit/xre/nsAppRunner.cpp

@@ -5154,31 +5154,23 @@ BrowserTabsRemoteAutostart()
     return gBrowserTabsRemoteAutostart;
   }
 
-  bool optInPref = Preferences::GetBool("browser.tabs.remote.autostart", false);
-  bool trialPref = Preferences::GetBool("browser.tabs.remote.autostart.2", false);
-  bool prefEnabled = optInPref || trialPref;
-  int status;
-  if (optInPref) {
-    status = kE10sEnabledByUser;
-  } else if (trialPref) {
-    status = kE10sEnabledByDefault;
-  } else {
-    status = kE10sDisabledByUser;
-  }
+  bool optInPref = Preferences::GetBool("browser.tabs.remote.autostart", true);
+  int status = kE10sEnabledByDefault;
 
-  if (prefEnabled) {
+  if (optInPref) {
     uint32_t blockPolicy = MultiprocessBlockPolicy();
     if (blockPolicy != 0) {
       status = blockPolicy;
     } else {
       gBrowserTabsRemoteAutostart = true;
     }
+  } else {
+    status = kE10sDisabledByUser;
   }
 
   // Uber override pref for manual testing purposes
   if (Preferences::GetBool(kForceEnableE10sPref, false)) {
     gBrowserTabsRemoteAutostart = true;
-    prefEnabled = true;
     status = kE10sEnabledByUser;
   }
 
@@ -5193,10 +5185,6 @@ BrowserTabsRemoteAutostart()
   gBrowserTabsRemoteStatus = status;
 
   mozilla::Telemetry::Accumulate(mozilla::Telemetry::E10S_STATUS, status);
-  if (prefEnabled) {
-    mozilla::Telemetry::Accumulate(mozilla::Telemetry::E10S_BLOCKED_FROM_RUNNING,
-                                    !gBrowserTabsRemoteAutostart);
-  }
   return gBrowserTabsRemoteAutostart;
 }