Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 13 insertions, 18 deletions

diff --git a/toolkit/components/remotebrowserutils/tests/browser/browser_documentChannel.js b/toolkit/components/remotebrowserutils/tests/browser/browser_documentChannel.js
index f32216010b..87bf94a59b 100644
--- a/toolkit/components/remotebrowserutils/tests/browser/browser_documentChannel.js
+++ b/toolkit/components/remotebrowserutils/tests/browser/browser_documentChannel.js
@@ -37,14 +37,14 @@ const EXTENSION_DATA = {
   async background() {
     browser.test.log("background script running");
     browser.webRequest.onAuthRequired.addListener(
-      async details => {
+      async () => {
         browser.test.log("webRequest onAuthRequired");
 
         // A blocking request that returns a promise exercises a codepath that
         // sets the notificationCallbacks on the channel to a JS object that we
         // can't do directly QueryObject on with expected results.
         // This triggered a crash which was fixed in bug 1528188.
-        return new Promise((resolve, reject) => {
+        return new Promise(resolve => {
           setTimeout(resolve, 0);
         });
       },
diff --git a/toolkit/components/remotebrowserutils/tests/browser/browser_httpCrossOriginOpenerPolicy.js b/toolkit/components/remotebrowserutils/tests/browser/browser_httpCrossOriginOpenerPolicy.js
index 5f3eade823..7ef8204246 100644
--- a/toolkit/components/remotebrowserutils/tests/browser/browser_httpCrossOriginOpenerPolicy.js
+++ b/toolkit/components/remotebrowserutils/tests/browser/browser_httpCrossOriginOpenerPolicy.js
@@ -106,7 +106,7 @@ function waitForDownloadWindow() {
         var domwindow = aXULWindow.docShell.domWindow;
         domwindow.addEventListener("load", downloadOnLoad, true);
       },
-      onCloseWindow: aXULWindow => {},
+      onCloseWindow: () => {},
     };
 
     Services.wm.addListener(listener);
diff --git a/toolkit/components/remotebrowserutils/tests/browser/browser_oopProcessSwap.js b/toolkit/components/remotebrowserutils/tests/browser/browser_oopProcessSwap.js
index 3286227d37..a30a919507 100644
--- a/toolkit/components/remotebrowserutils/tests/browser/browser_oopProcessSwap.js
+++ b/toolkit/components/remotebrowserutils/tests/browser/browser_oopProcessSwap.js
@@ -63,14 +63,11 @@ add_task(async function oopProcessSwap() {
       );
 
       is(browser.browsingContext.children.length, 1);
-
-      if (Services.prefs.getBoolPref("fission.preserve_browsing_contexts")) {
-        is(
-          frameId,
-          oopinfo.browsingContextId,
-          `BrowsingContext should not have changed (${frameId} != ${oopinfo.browsingContextId})`
-        );
-      }
+      is(
+        frameId,
+        oopinfo.browsingContextId,
+        `BrowsingContext should not have changed (${frameId} != ${oopinfo.browsingContextId})`
+      );
       is(oopinfo.location, WEB, "correct location");
     }
   );
@@ -146,13 +143,11 @@ add_task(async function oopOriginProcessSwap() {
       );
 
       is(browser.browsingContext.children.length, 1);
-      if (Services.prefs.getBoolPref("fission.preserve_browsing_contexts")) {
-        is(
-          frameId,
-          oopinfo.browsingContextId,
-          `BrowsingContext should not have changed (${frameId} != ${oopinfo.browsingContextId})`
-        );
-      }
+      is(
+        frameId,
+        oopinfo.browsingContextId,
+        `BrowsingContext should not have changed (${frameId} != ${oopinfo.browsingContextId})`
+      );
       is(oopinfo.location, ORG_POSTMSG, "correct location");
     }
   );