Back out bug 1236754 now that e10s is off in beta (a=ritu)
authorBill McCloskey <wmccloskey@mozilla.com>
Wed, 13 Jan 2016 14:05:15 -0800
changeset 306020 0fb284f396774d8553e02bc064822b3459361c20
parent 306019 bdb6dcb5477b9afc0328f70fc35cd8f30470cd99
child 306021 6227624c15df9f8ffcb6e8621fed477bd2d4a1a9
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersritu
bugs1236754
milestone44.0
Back out bug 1236754 now that e10s is off in beta (a=ritu)
browser/app/profile/firefox.js
js/xpconnect/src/XPCWrappedNativeScope.cpp
toolkit/mozapps/extensions/internal/XPIProvider.jsm
toolkit/xre/nsXREDirProvider.cpp
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1605,18 +1605,18 @@ pref("browser.tabs.crashReporting.email"
 #ifndef MOZ_MULET
 pref("layers.async-pan-zoom.enabled", true);
 #endif
 #endif
 
 #ifdef E10S_TESTING_ONLY
 // Enable e10s add-on interposition by default.
 pref("extensions.interposition.enabled", true);
+pref("extensions.interposition.prefetching", true);
 #endif
-pref("extensions.interposition.prefetching", true);
 
 pref("browser.defaultbrowser.notificationbar", false);
 
 // How often to check for CPOW timeouts. CPOWs are only timed out by
 // the hang monitor.
 pref("dom.ipc.cpow.timeout", 500);
 
 // Enable e10s hang monitoring (slow script checking and plugin hang
--- a/js/xpconnect/src/XPCWrappedNativeScope.cpp
+++ b/js/xpconnect/src/XPCWrappedNativeScope.cpp
@@ -142,17 +142,17 @@ XPCWrappedNativeScope::XPCWrappedNativeS
         if (InterpositionMap::Ptr p = gInterpositionMap->lookup(addonId)) {
             MOZ_RELEASE_ASSERT(isSystem);
             mInterposition = p->value();
         }
         // We also want multiprocessCompatible add-ons to have a default interposition.
         if (!mInterposition && addonId && isSystem) {
           bool interpositionEnabled = mozilla::Preferences::GetBool(
             "extensions.interposition.enabled", false);
-          if (interpositionEnabled || BrowserTabsRemoteAutostart()) {
+          if (interpositionEnabled) {
             mInterposition = do_GetService("@mozilla.org/addons/default-addon-shims;1");
             MOZ_ASSERT(mInterposition);
             UpdateInterpositionWhitelist(cx, mInterposition);
           }
         }
     }
 }
 
--- a/toolkit/mozapps/extensions/internal/XPIProvider.jsm
+++ b/toolkit/mozapps/extensions/internal/XPIProvider.jsm
@@ -4288,19 +4288,17 @@ this.XPIProvider = {
       this.bootstrapScopes[aId] = null;
       return;
     }
 
     logger.debug("Loading bootstrap scope from " + aFile.path);
 
     let principal = Cc["@mozilla.org/systemprincipal;1"].
                     createInstance(Ci.nsIPrincipal);
-    let useInterposition = Preferences.get(PREF_INTERPOSITION_ENABLED, false) ||
-                           Services.appinfo.browserTabsRemoteAutostart;
-    if (!aMultiprocessCompatible && useInterposition) {
+    if (!aMultiprocessCompatible && Preferences.get(PREF_INTERPOSITION_ENABLED, false)) {
       let interposition = Cc["@mozilla.org/addons/multiprocess-shims;1"].
         getService(Ci.nsIAddonInterposition);
       Cu.setAddonInterposition(aId, interposition);
     }
 
     if (!aFile.exists()) {
       this.bootstrapScopes[aId] =
         new Cu.Sandbox(principal, { sandboxName: aFile.path,
--- a/toolkit/xre/nsXREDirProvider.cpp
+++ b/toolkit/xre/nsXREDirProvider.cpp
@@ -553,18 +553,17 @@ nsXREDirProvider::GetFiles(const char* a
     return rv;
 
   return NS_SUCCESS_AGGREGATE_RESULT;
 }
 
 static void
 RegisterExtensionInterpositions(nsINIParser &parser)
 {
-  if (!mozilla::Preferences::GetBool("extensions.interposition.enabled", false) &&
-      !BrowserTabsRemoteAutostart())
+  if (!mozilla::Preferences::GetBool("extensions.interposition.enabled", false))
     return;
 
   nsCOMPtr<nsIAddonInterposition> interposition =
     do_GetService("@mozilla.org/addons/multiprocess-shims;1");
 
   nsresult rv;
   int32_t i = 0;
   do {