Bug 1363083 - Remove TabMixPlus and Mega from e10s blocklist. r=mrbkap, a=gchang
authorFelipe Gomes <felipc@gmail.com>
Tue, 16 May 2017 16:20:56 -0300
changeset 393993 21648cfdecd87bce49002cbc0fee522da93494e1
parent 393992 66efefd445ba5a4d9bb084ac6dd97375ec459043
child 393994 5a67d411498982aec919e3c4d3e045ce3c250d75
push id7323
push userryanvm@gmail.com
push dateThu, 18 May 2017 12:36:33 +0000
treeherdermozilla-beta@5a67d4114989 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmrbkap, gchang
bugs1363083
milestone54.0
Bug 1363083 - Remove TabMixPlus and Mega from e10s blocklist. r=mrbkap, a=gchang MozReview-Commit-ID: 5o14Wvu2rIN
browser/extensions/e10srollout/bootstrap.js
--- a/browser/extensions/e10srollout/bootstrap.js
+++ b/browser/extensions/e10srollout/bootstrap.js
@@ -92,25 +92,20 @@ function defineCohort() {
     setCohort("unsupportedChannel");
     return;
   }
 
   let addonPolicy = "unknown";
   if (updateChannel in ADDON_ROLLOUT_POLICY) {
     addonPolicy = ADDON_ROLLOUT_POLICY[updateChannel];
     Preferences.set(PREF_E10S_ADDON_POLICY, addonPolicy);
+
     // This is also the proper place to set the blocklist pref
     // in case it is necessary.
-
-    Preferences.set(PREF_E10S_ADDON_BLOCKLIST,
-                    // bug 1185672 - Tab Mix Plus
-                    "{dc572301-7619-498c-a57d-39143191b318};"
-                    // bug 1344345 - Mega
-                    + "firefox@mega.co.nz"
-                    );
+    Preferences.set(PREF_E10S_ADDON_BLOCKLIST, "");
   } else {
     Preferences.reset(PREF_E10S_ADDON_POLICY);
   }
 
   let userOptedOut = optedOut();
   let userOptedIn = optedIn();
   let disqualified = (Services.appinfo.multiprocessBlockPolicy != 0);
   let testThreshold = TEST_THRESHOLD[updateChannel];