From 28c4192ac2b3c42d1e6ab46e7591b015a803daa5 Mon Sep 17 00:00:00 2001
From: Kathy Brade <brade@pearlcrescent.com>
Date: Tue, 11 Apr 2017 11:33:02 -0400
Subject: [PATCH] Bug 21876: Always use esr policies for e10s.

Always use the policies associated with the esr update channel so that
the e10s behavior is the same for all Tor Browser builds.
---
 browser/extensions/e10srollout/bootstrap.js | 5 ++++-
 toolkit/xre/nsAppRunner.cpp                 | 9 +++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/browser/extensions/e10srollout/bootstrap.js b/browser/extensions/e10srollout/bootstrap.js
index 0da7ac225a7e2..85b9caa063f64 100644
--- a/browser/extensions/e10srollout/bootstrap.js
+++ b/browser/extensions/e10srollout/bootstrap.js
@@ -77,7 +77,10 @@ function defineCohort() {
   }
   cohortDefinedOnThisSession = true;
 
-  let updateChannel = UpdateUtils.getUpdateChannel(false);
+  // For Tor Browser, always use the e10s policies associated with the esr
+  // update channel so that the e10s behavior is the same for all builds.
+  let updateChannel = "esr";
+
   if (!(updateChannel in TEST_THRESHOLD)) {
     setCohort("unsupportedChannel");
     return;
diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
index 721f599622500..190fec19e5205 100644
--- a/toolkit/xre/nsAppRunner.cpp
+++ b/toolkit/xre/nsAppRunner.cpp
@@ -5453,15 +5453,12 @@ MultiprocessBlockPolicy() {
 #endif
 
   /**
-   * Avoids enabling e10s for Windows XP users on the release channel.
+   * Avoid enabling e10s for all Windows XP users.
    */
 #if defined(XP_WIN)
   if (!IsVistaOrLater()) {
-    nsAdoptingCString channelName = Preferences::GetDefaultCString("app.update.channel");
-    if (channelName.EqualsLiteral("release") || channelName.EqualsLiteral("esr")) {
-      gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem;
-      return gMultiprocessBlockPolicy;
-    }
+    gMultiprocessBlockPolicy = kE10sDisabledForOperatingSystem;
+    return gMultiprocessBlockPolicy;
   }
 #endif // XP_WIN
 
-- 
GitLab