Bug 1264437 - Manage browser.tabs.remote.autostart.2 pref even for disqualified users. r=rvitillo draft
authorFelipe Gomes <felipc@gmail.com>
Thu, 14 Apr 2016 12:20:30 -0300
changeset 350971 574415656cbcc46195e1b61f9289a056ad8c2cc7
parent 350458 c3a52b35cc48ac3c60cced5345e8df92688f9fa4
child 518442 4b50b0c701a378ed487223f954046abf3013b4c4
push id15462
push userfelipc@gmail.com
push dateThu, 14 Apr 2016 15:20:54 +0000
reviewersrvitillo
bugs1264437
milestone48.0a1
Bug 1264437 - Manage browser.tabs.remote.autostart.2 pref even for disqualified users. r=rvitillo MozReview-Commit-ID: ALyxXdWGsdK
browser/extensions/e10srollout/bootstrap.js
--- a/browser/extensions/e10srollout/bootstrap.js
+++ b/browser/extensions/e10srollout/bootstrap.js
@@ -58,23 +58,21 @@ function defineCohort() {
   let userOptedIn = optedIn();
   let disqualified = (Services.appinfo.multiprocessBlockPolicy != 0);
   let testGroup = (getUserSample() < TEST_THRESHOLD[updateChannel]);
 
   if (userOptedOut) {
     setCohort("optedOut");
   } else if (userOptedIn) {
     setCohort("optedIn");
-  } else if (disqualified) {
-    setCohort("disqualified");
   } else if (testGroup) {
-    setCohort("test");
+    setCohort(disqualified ? "disqualified-test" : "test");
     Preferences.set(PREF_TOGGLE_E10S, true);
   } else {
-    setCohort("control");
+    setCohort(disqualified ? "disqualified-control" : "control");
     Preferences.reset(PREF_TOGGLE_E10S);
   }
 }
 
 function shutdown(data, reason) {
 }
 
 function uninstall() {