From 7a8e1e0da1f1c29c817d59551ebdd06b14e69486 Mon Sep 17 00:00:00 2001
From: Felipe Gomes <felipc@gmail.com>
Date: Mon, 21 Mar 2016 13:20:17 -0300
Subject: [PATCH] Bug 1257972 - Put users currently running an experiment into
 the disqualified cohort of the e10s rollout system add-on. r=Mossop

MozReview-Commit-ID: 4NQo6d672rR
---
 browser/extensions/e10srollout/bootstrap.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/browser/extensions/e10srollout/bootstrap.js b/browser/extensions/e10srollout/bootstrap.js
index e009d92dffc4e..81aabfa2c8da9 100644
--- 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);
+}