Bug 1147156 - Re-enable e10s by default for Nightly users who may have disabled it. r=poirot,mconley

b2g/app/b2g.js

@@ -29,6 +29,7 @@ pref("browser.sessionstore.restore_on_demand", false);
 pref("browser.sessionstore.resume_from_crash", false);
 // No e10s on mulet
 pref("browser.tabs.remote.autostart.1", false);
+pref("browser.tabs.remote.autostart.2", false);
 #endif
 
 // Bug 945235: Prevent all bars to be considered visible:

b2g/dev/app/mulet.js

@@ -17,3 +17,4 @@ pref("devtools.toolbox.sidebar.width", 800);
 // nor the system app OOP, but only inner apps
 pref("browser.tabs.remote.autostart", false);
 pref("browser.tabs.remote.autostart.1", false);
+pref("browser.tabs.remote.autostart.2", false);

browser/app/profile/firefox.js

@@ -1855,7 +1855,11 @@ pref("privacy.trackingprotection.ui.enabled", false);
 #endif
 
 #ifdef NIGHTLY_BUILD
-pref("browser.tabs.remote.autostart.1", true);
+// 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
 
 #ifdef NIGHTLY_BUILD

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

@@ -14,7 +14,7 @@
                 name="browser.tabs.remote.autostart"
                 type="bool"/>
     <preference id="e10sTempPref"
-                name="browser.tabs.remote.autostart.1"
+                name="browser.tabs.remote.autostart.2"
                 type="bool"/>
 #endif
 

layout/tools/reftest/runreftest.py

@@ -222,6 +222,7 @@ class RefTest(object):
 
     #Don't use auto-enabled e10s
     prefs['browser.tabs.remote.autostart.1'] = False
+    prefs['browser.tabs.remote.autostart.2'] = False
     if options.e10s:
       prefs['browser.tabs.remote.autostart'] = True
 

testing/profiles/prefs_general.js

@@ -304,6 +304,7 @@ user_pref("media.decoder.heuristic.dormant.timeout", 0);
 user_pref("browser.displayedE10SPrompt.1", 5);
 // Don't use auto-enabled e10s
 user_pref("browser.tabs.remote.autostart.1", false);
+user_pref("browser.tabs.remote.autostart.2", false);
 // Don't forceably kill content processes after a timeout
 user_pref("dom.ipc.tabs.shutdownTimeoutSecs", 0);
 

toolkit/xre/nsAppRunner.cpp

@@ -4614,7 +4614,7 @@ mozilla::BrowserTabsRemoteAutostart()
   }
   gBrowserTabsRemoteAutostartInitialized = true;
   bool optInPref = Preferences::GetBool("browser.tabs.remote.autostart", false);
-  bool trialPref = Preferences::GetBool("browser.tabs.remote.autostart.1", false);
+  bool trialPref = Preferences::GetBool("browser.tabs.remote.autostart.2", false);
   bool prefEnabled = optInPref || trialPref;
 #if !defined(NIGHTLY_BUILD)
   // When running tests with 'layers.offmainthreadcomposition.testing.enabled' and