Backed out changeset 26389c6e73ff (bug 1341008)

browser/app/profile/firefox.js

@@ -1526,10 +1526,6 @@ pref("browser.esedbreader.loglevel", "Error");
 
 pref("browser.laterrun.enabled", false);
 
-#ifdef NIGHTLY_BUILD
-pref("dom.ipc.processPrelaunch.enabled", true);
-#endif
-
 #ifdef EARLY_BETA_OR_EARLIER
 pref("browser.migrate.automigrate.enabled", true);
 #else

browser/extensions/formautofill/bootstrap.js

@@ -60,9 +60,6 @@ function startup() {
   Services.wm.addListener(windowListener);
 
   parent.init();
-  Services.ppmm.loadProcessScript("data:,new " + function() {
-    Components.utils.import("resource://formautofill/FormAutofillContent.jsm");
-  }, true);
   Services.mm.loadFrameScript("chrome://formautofill/content/FormAutofillFrameScript.js", true);
 }
 

dom/base/test/browser_messagemanager_loadprocessscript.js

@@ -49,13 +49,6 @@ function promiseMessage(messageManager, message) {
   })
 }
 
-add_task(function*(){
-  // We want to count processes in this test, so let's disable the pre-allocated process manager.
-  yield SpecialPowers.pushPrefEnv({"set": [
-    ["dom.ipc.processPrelaunch.enabled", false],
-  ]});
-})
-
 add_task(function*(){
   // This test is only relevant in e10s.
   if (!gMultiProcessBrowser)

dom/ipc/ContentParent.cpp

@@ -623,6 +623,9 @@ ContentParent::StartUp()
 
   BackgroundChild::Startup();
 
+  // Try to preallocate a process that we can use later.
+  PreallocatedProcessManager::AllocateAfterDelay();
+
   sDisableUnsafeCPOWWarnings = PR_GetEnv("DISABLE_UNSAFE_CPOW_WARNINGS");
 
 #if defined(XP_LINUX) && defined(MOZ_CONTENT_SANDBOX)

dom/ipc/PreallocatedProcessManager.cpp

@@ -132,8 +132,6 @@ PreallocatedProcessManagerImpl::Observe(nsISupports* aSubject,
       os->RemoveObserver(this, "ipc:content-shutdown");
       os->RemoveObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID);
     }
-    mShutdown = true;
-    CloseProcess();
   } else {
     MOZ_ASSERT(false);
   }
@@ -144,8 +142,7 @@ PreallocatedProcessManagerImpl::Observe(nsISupports* aSubject,
 void
 PreallocatedProcessManagerImpl::RereadPrefs()
 {
-  if (mozilla::BrowserTabsRemoteAutostart() &&
-      Preferences::GetBool("dom.ipc.processPrelaunch.enabled")) {
+  if (Preferences::GetBool("dom.ipc.processPrelaunch.enabled")) {
     Enable();
   } else {
     Disable();
@@ -202,7 +199,7 @@ PreallocatedProcessManagerImpl::AllocateOnIdle()
 void
 PreallocatedProcessManagerImpl::AllocateNow()
 {
-  if (!mEnabled || mPreallocatedProcess || mShutdown ||
+  if (!mEnabled || mPreallocatedProcess ||
       ContentParent::IsMaxProcessCountReached(NS_LITERAL_STRING(DEFAULT_REMOTE_TYPE))) {
     return;
   }

toolkit/components/addoncompat/RemoteAddonsParent.jsm

@@ -1063,10 +1063,6 @@ var RemoteAddonsParent = {
 
     Services.ppmm.initialProcessData.remoteAddonsParentInitted = true;
 
-    Services.ppmm.loadProcessScript("data:,new " + function() {
-      Components.utils.import("resource://gre/modules/RemoteAddonsChild.jsm");
-    }, true);
-
     this.globalToBrowser = new WeakMap();
     this.browserToGlobal = new WeakMap();
   },

toolkit/components/extensions/Extension.jsm

@@ -65,6 +65,7 @@ XPCOMUtils.defineLazyModuleGetter(this, "Schemas",
 XPCOMUtils.defineLazyModuleGetter(this, "Task",
                                   "resource://gre/modules/Task.jsm");
 
+Cu.import("resource://gre/modules/ExtensionContent.jsm");
 Cu.import("resource://gre/modules/ExtensionManagement.jsm");
 Cu.import("resource://gre/modules/ExtensionParent.jsm");
 Cu.import("resource://gre/modules/ExtensionUtils.jsm");
@@ -1003,7 +1004,3 @@ this.Extension = class extends ExtensionData {
     return this.manifest.name;
   }
 };
-
-Services.ppmm.loadProcessScript("data:,new " + function() {
-  Components.utils.import("resource://gre/modules/ExtensionContent.jsm");
-}, true);