From 0b7581a7f3c6e68762c5367bf8a3774759e915f8 Mon Sep 17 00:00:00 2001
From: Bob Owen <bobowencode@gmail.com>
Date: Wed, 25 Jan 2017 14:10:03 +0000
Subject: [PATCH] Bug 1327942 Part 1: Allow about pages that can load in
 non-remote and remote browser to load in any remote type. r=gijs

---
 browser/modules/E10SUtils.jsm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/browser/modules/E10SUtils.jsm b/browser/modules/E10SUtils.jsm
index 768f4317f73e..f496459df44c 100644
--- a/browser/modules/E10SUtils.jsm
+++ b/browser/modules/E10SUtils.jsm
@@ -102,9 +102,10 @@ this.E10SUtils = {
         return DEFAULT_REMOTE_TYPE;
       }
 
-      if (flags & Ci.nsIAboutModule.URI_CAN_LOAD_IN_CHILD &&
-          aPreferredRemoteType != NOT_REMOTE) {
-        return DEFAULT_REMOTE_TYPE;
+      // If the about page can load in parent or child, it should be safe to
+      // load in any remote type.
+      if (flags & Ci.nsIAboutModule.URI_CAN_LOAD_IN_CHILD) {
+        return aPreferredRemoteType;
       }
 
       return NOT_REMOTE;