Bug 1332692 - Block LastPass and Amazon Assistant from e10s rollout. r=mkaply draft
authorFelipe Gomes <felipc@gmail.com>
Tue, 24 Jan 2017 14:13:10 -0200
changeset 465652 595a482068e93e473fa61989cb501daaf1a08c41
parent 465651 5e3df08ab2a93c7cd2216fa89c0a0811f2703305
child 543205 875b0ecb7869e6b135b1fde8407be0034cb553dd
push id42661
push userfelipc@gmail.com
push dateTue, 24 Jan 2017 16:14:20 +0000
reviewersmkaply
bugs1332692
milestone51.0.1
Bug 1332692 - Block LastPass and Amazon Assistant from e10s rollout. r=mkaply MozReview-Commit-ID: 4q8RNApwflm
browser/extensions/e10srollout/bootstrap.js
--- a/browser/extensions/e10srollout/bootstrap.js
+++ b/browser/extensions/e10srollout/bootstrap.js
@@ -64,19 +64,22 @@ function defineCohort() {
 
   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.
 
-    // Tab Mix Plus exception tracked at bug 1185672.
     Preferences.set(PREF_E10S_ADDON_BLOCKLIST,
-                    "{dc572301-7619-498c-a57d-39143191b318}");
+                    // bug 1185672 - Tab Mix Plus
+                    "{dc572301-7619-498c-a57d-39143191b318};" +
+                    // bug 1332692 - LastPass and Amazon Assistant
+                    "support@lastpass.com;" +
+                    "abb-acer@amazon.com;");
   } else {
     Preferences.reset(PREF_E10S_ADDON_POLICY);
   }
 
   let userOptedOut = optedOut();
   let userOptedIn = optedIn();
   let disqualified = (Services.appinfo.multiprocessBlockPolicy != 0);
   let testGroup = (getUserSample() < TEST_THRESHOLD[updateChannel]);