Bug 1373707 - Rename some things to clarify what's going on. r=Felipe draft
authorBlake Kaplan <mrbkap@gmail.com>
Fri, 16 Jun 2017 10:33:19 -0700
changeset 595704 85c128b536cd3a9121fc39dc30fca07908d8691e
parent 595703 920bcc74f6f73c96bf2b3381b8a1b493bdd85e3b
child 633782 ba64aef55d801d220d48fb64fc0fe011f9e3628d
push id64423
push userbmo:mrbkap@mozilla.com
push dateFri, 16 Jun 2017 18:07:48 +0000
reviewersFelipe
bugs1373707
milestone56.0a1
Bug 1373707 - Rename some things to clarify what's going on. r=Felipe Felipe, let me know if you like this. Otherwise, I'll only land the first changeset here. MozReview-Commit-ID: 3CYNcOjFu6q
browser/extensions/e10srollout/bootstrap.js
--- a/browser/extensions/e10srollout/bootstrap.js
+++ b/browser/extensions/e10srollout/bootstrap.js
@@ -17,26 +17,26 @@ const TEST_THRESHOLD = {
   "release": 1.0,  // 100%
   "esr": 1.0,  // 100%
 };
 
 // If a user qualifies for the e10s-multi experiement, this is how many
 // content processes to use and whether to allow addons for the experiment.
 const MULTI_EXPERIMENT = {
   "beta": { buckets: { 1: .5, 4: 1, }, // 1 process: 50%, 4 processes: 50%
-            addons: true },
+            addonsDisableExperiment: false },
 
   "release": { buckets: { 1: .2, 4: 1 }, // 1 process: 20%, 4 processes: 80%
 
                // This getter is only called if there's at least one addon
                // installed. When on the "release" channel,
                // getAddonsDisqualifyForMulti will return true if any addon
                // installed is not a web extension. Therefore, this returns
                // true if and only if all addons installed are web extensions.
-               get addons() { return getAddonsDisqualifyForMulti(); } }
+               get addonsDisableExperiment() { return getAddonsDisqualifyForMulti(); } }
 };
 
 const ADDON_ROLLOUT_POLICY = {
   "beta": "50allmpc",
   "release": "50allmpc",
   "esr": "esrA", // WebExtensions and Addons with mpc=true
 };
 
@@ -175,17 +175,17 @@ function defineCohort() {
   //   (i.e. there's at least one addon installed) we stop here.
   // - We decided above whether this user qualifies for the experiment.
   // - If the user already opted into multi, then their prefs are already set
   //   correctly, we're done.
   // - If the user has addons that disqualify them for multi, leave them with
   //   the default number of content processes (1 on beta) but still in the
   //   test cohort.
   if (!(updateChannel in MULTI_EXPERIMENT) ||
-      (!MULTI_EXPERIMENT[updateChannel].addons && cohortPrefix) ||
+      MULTI_EXPERIMENT[updateChannel].addonsDisableExperiment ||
       !eligibleForMulti ||
       userOptedIn.multi ||
       disqualified) {
     Preferences.reset(PREF_E10S_PROCESSCOUNT + ".web");
     return;
   }
 
   // If we got here with a cohortPrefix, it must be "addons-set50allmpc-",