Bug 1257972 - Put users currently running an experiment into the disq…

…ualified cohort of the e10s rollout system add-on. r=Mossop MozReview-Commit-ID: 4NQo6d672rR
Brli · Mar 21, 2016 · 7a8e1e0 · 7a8e1e0
1 parent f3ecdc8
commit 7a8e1e0
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/browser/extensions/e10srollout/bootstrap.js b/browser/extensions/e10srollout/bootstrap.js
@@ -56,7 +56,8 @@ function defineCohort() {
 
   let userOptedOut = optedOut();
   let userOptedIn = optedIn();
-  let disqualified = (Services.appinfo.multiprocessBlockPolicy != 0);
+  let disqualified = (Services.appinfo.multiprocessBlockPolicy != 0) ||
+                     isThereAnActiveExperiment();
   let testGroup = (getUserSample() < TEST_THRESHOLD[updateChannel]);
 
   if (userOptedOut) {
@@ -112,3 +113,7 @@ function optedOut() {
           Preferences.get(PREF_TOGGLE_E10S) == false);
 }
 
+function isThereAnActiveExperiment() {
+  let { Experiments } = Cu.import("resource:///modules/experiments/Experiments.jsm", {});
+  return (Experiments.instance().getActiveExperiment() !== null);
+}