Bug 1264345 - Remove restriction to disqualify from e10s the users who are running an experiment, by backing out bug 1257972. r=backout a=backout
authorFelipe Gomes <felipc@gmail.com>
Thu, 14 Apr 2016 12:37:11 -0300
changeset 323944 74e3c3ac7049652b21d532fca2fc0a7f82e90a71
parent 323943 949d0760be73d73ee1fa7dab0b5a7102f169ece3
child 323945 5662624cb37150749cf0e28182b95c24f29fc8f7
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout, backout
bugs1264345, 1257972
milestone47.0a2
Bug 1264345 - Remove restriction to disqualify from e10s the users who are running an experiment, by backing out bug 1257972. r=backout a=backout MozReview-Commit-ID: FOYChxbTScx
browser/extensions/e10srollout/bootstrap.js
--- a/browser/extensions/e10srollout/bootstrap.js
+++ b/browser/extensions/e10srollout/bootstrap.js
@@ -51,18 +51,17 @@ function defineCohort() {
   let updateChannel = UpdateUtils.getUpdateChannel(false);
   if (!(updateChannel in TEST_THRESHOLD)) {
     setCohort("unsupportedChannel");
     return;
   }
 
   let userOptedOut = optedOut();
   let userOptedIn = optedIn();
-  let disqualified = (Services.appinfo.multiprocessBlockPolicy != 0) ||
-                     isThereAnActiveExperiment();
+  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");
@@ -107,13 +106,8 @@ function optedIn() {
 function optedOut() {
   // Users can also opt-out by toggling back the pref to false.
   // If they reset the pref instead they might be re-enabled if
   // they are still part of the threshold.
   return Preferences.get(PREF_E10S_FORCE_DISABLED, false) ||
          (Preferences.isSet(PREF_TOGGLE_E10S) &&
           Preferences.get(PREF_TOGGLE_E10S) == false);
 }
-
-function isThereAnActiveExperiment() {
-  let { Experiments } = Cu.import("resource:///modules/experiments/Experiments.jsm", {});
-  return (Experiments.instance().getActiveExperimentID() !== null);
-}