Merge branch 'master' into Basilisk-releasev2018.11.04

2 files changed, 5 insertions, 7 deletions

diff --git a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
index 7b86fa07c..3eec9827d 100644
--- a/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
+++ b/toolkit/components/thumbnails/BackgroundPageThumbs.jsm
@@ -206,9 +206,13 @@ const BackgroundPageThumbs = {
 
     let browser = this._parentWin.document.createElementNS(XUL_NS, "browser");
     browser.setAttribute("type", "content");
-    browser.setAttribute("remote", "true");
     browser.setAttribute("disableglobalhistory", "true");
 
+    if (Services.prefs.getPrefType("browser.tabs.remote") == Services.prefs.PREF_BOOL &&
+        Services.prefs.getBoolPref("browser.tabs.remote")) {
+      browser.setAttribute("remote", "true");
+    }
+
     if (Services.prefs.getBoolPref(ABOUT_NEWTAB_SEGREGATION_PREF)) {
       // Use the private container for thumbnails.
       let privateIdentity =
diff --git a/toolkit/components/thumbnails/test/test_thumbnails_interfaces.js b/toolkit/components/thumbnails/test/test_thumbnails_interfaces.js
index 8272b2e06..a8fe51418 100644
--- a/toolkit/components/thumbnails/test/test_thumbnails_interfaces.js
+++ b/toolkit/components/thumbnails/test/test_thumbnails_interfaces.js
@@ -22,10 +22,4 @@ function run_test() {
                                null, null);
   ok(uri instanceof Ci.nsIFileURL, "moz-page-thumb:// is a FileURL");
   ok(uri.file, "This moz-page-thumb:// object is backed by a file");
-
-  // and check that the error case works as specified
-  let bad = Services.io.newURI("moz-page-thumb://wronghost/?url=http%3A%2F%2Fwww.mozilla.org%2F",
-                               null, null);
-  Assert.throws(() => handler.resolveURI(bad), /NS_ERROR_NOT_AVAILABLE/i,
-                "moz-page-thumb object with wrong host must not resolve to a file path");
 }