Bug 1264345 - Remove restriction to disqualify from e10s the users who are running an experiment, by backing out bug 1257972. r=backout
authorFelipe Gomes <felipc@gmail.com>
Wed, 13 Apr 2016 16:02:31 -0300
changeset 293059 30b59b826bf51c828d5af28e24ec3254e4515999
parent 293058 ac23c193d06abf24cec53133fe7220450801ed85
child 293060 4aec5484727310c0ddba1d05142095391f570140
push id30174
push usercbook@mozilla.com
push dateThu, 14 Apr 2016 09:36:18 +0000
treeherdermozilla-central@52ebea10c080 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1264345, 1257972
milestone48.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1264345 - Remove restriction to disqualify from e10s the users who are running an experiment, by backing out bug 1257972. r=backout MozReview-Commit-ID: JkHhNa7Wo5O
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");
@@ -109,13 +108,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);
-}