mozilla-central: changeset 289684:551375db18bf7dc0585e3f5466f3c1c12a05f9b1

author	Felipe Gomes <felipc@gmail.com>
	Mon, 21 Mar 2016 15:00:21 -0300
changeset 289684	551375db18bf7dc0585e3f5466f3c1c12a05f9b1
parent 289683	092c3fff5ec95fca42b59eafa14be2ab188c8b7d
child 289685	52c1e3e2fcfb5285f563b8912cc7c74cebcaac1e
push id	30108
push user	cbook@mozilla.com
push date	Tue, 22 Mar 2016 11:14:31 +0000
treeherder	mozilla-central@ea6298e1b4f7 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	me
bugs	1257972
milestone	48.0a1
first release with	nightly linux32 efe7d026ac64 / 48.0a1 / 20160323030400 / files nightly linux64 efe7d026ac64 / 48.0a1 / 20160323030400 / files nightly mac efe7d026ac64 / 48.0a1 / 20160323030400 / files nightly win32 efe7d026ac64 / 48.0a1 / 20160323030400 / files nightly win64 efe7d026ac64 / 48.0a1 / 20160323030400 / files
last release without	nightly linux32 f14898695ee0 / 48.0a1 / 20160321030217 / files nightly linux64 f14898695ee0 / 48.0a1 / 20160321030217 / files nightly mac f14898695ee0 / 48.0a1 / 20160321030217 / files nightly win32 f14898695ee0 / 48.0a1 / 20160321030217 / files nightly win64 f14898695ee0 / 48.0a1 / 20160321030217 / files

Bug 1257972 - Follow up, use getActiveExperimentID instead. r=me getActiveExperimentID() checks for this._experiments being not null, while the other one doesn't. So this one is more resilient to a profile that has not had any previous experiments MozReview-Commit-ID: 80Spz1syctg

browser/extensions/e10srollout/bootstrap.js

file | annotate | diff | comparison | revisions

--- a/browser/extensions/e10srollout/bootstrap.js
+++ b/browser/extensions/e10srollout/bootstrap.js
@@ -110,10 +110,10 @@ function optedOut() {
   // 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().getActiveExperiment() !== null);
+  return (Experiments.instance().getActiveExperimentID() !== null);
 }