Bug 1363083 - Remove TabMixPlus and Mega from e10s blocklist. r=mrbkap draft
authorFelipe Gomes <felipc@gmail.com>
Tue, 16 May 2017 16:20:56 -0300
changeset 578972 2b7287bca508c3590747633adca11f563c544eb3
parent 578971 925160e8379600a79d869cf18df4f158e7eb1868
child 628872 7115ba2d7be3302065396bbf4781fcea908d1ed4
push id59105
push userfelipc@gmail.com
push dateTue, 16 May 2017 19:21:34 +0000
reviewersmrbkap
bugs1363083
milestone54.0
Bug 1363083 - Remove TabMixPlus and Mega from e10s blocklist. r=mrbkap 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];