Adding upstream version 125.0.1.upstream/125.0.1

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

13 files changed, 21 insertions, 19 deletions

diff --git a/docshell/test/chrome/DocShellHelpers.sys.mjs b/docshell/test/chrome/DocShellHelpers.sys.mjs
index 5f4eee8724..f57cdee321 100644
--- a/docshell/test/chrome/DocShellHelpers.sys.mjs
+++ b/docshell/test/chrome/DocShellHelpers.sys.mjs
@@ -31,7 +31,7 @@ export class DocShellHelpersChild extends JSWindowActorChild {
   constructor() {
     super();
   }
-  receiveMessage({ name, data }) {
+  receiveMessage({ name }) {
     if (name == "docshell_helpers:preventBFCache") {
       // Add an RTCPeerConnection to prevent the page from being bfcached.
       let win = this.contentWindow;
diff --git a/docshell/test/chrome/bug113934_window.xhtml b/docshell/test/chrome/bug113934_window.xhtml
index c5b676b6b8..8666b60e17 100644
--- a/docshell/test/chrome/bug113934_window.xhtml
+++ b/docshell/test/chrome/bug113934_window.xhtml
@@ -92,7 +92,7 @@
 
             var strs = { "f1": "", "f3" : "" };
             function attachListener(node, type) {
-              var listener = function(e) {
+              var listener = function() {
                 if (strs[node.id]) strs[node.id] += " ";
                 strs[node.id] += node.id + ".page" + type;
               }
diff --git a/docshell/test/chrome/bug215405_window.xhtml b/docshell/test/chrome/bug215405_window.xhtml
index ddbe2630b9..af5ecdde48 100644
--- a/docshell/test/chrome/bug215405_window.xhtml
+++ b/docshell/test/chrome/bug215405_window.xhtml
@@ -58,7 +58,7 @@
       });
     }
 
-    function onLoad(e) {
+    function onLoad() {
       gBrowser = document.getElementById("content");
       gBrowser.addEventListener("pageshow", eventListener, true);
 
@@ -66,7 +66,7 @@
       nextTest();
     }
 
-    function eventListener(event) {
+    function eventListener() {
       setTimeout(nextTest, 0);
     }
 
diff --git a/docshell/test/chrome/bug293235_window.xhtml b/docshell/test/chrome/bug293235_window.xhtml
index 8bb050cebb..e631b3b09b 100644
--- a/docshell/test/chrome/bug293235_window.xhtml
+++ b/docshell/test/chrome/bug293235_window.xhtml
@@ -67,7 +67,7 @@
 
         // Because adding visits is async, we will not be notified immediately.
         let visitObserver = {
-          observe(aSubject, aTopic, aData)
+          observe(aSubject, aTopic)
           {
             if (!testURI.equals(aSubject.QueryInterface(Ci.nsIURI))) {
               return;
diff --git a/docshell/test/chrome/bug301397_window.xhtml b/docshell/test/chrome/bug301397_window.xhtml
index cbfa77f7fd..4a6efc8622 100644
--- a/docshell/test/chrome/bug301397_window.xhtml
+++ b/docshell/test/chrome/bug301397_window.xhtml
@@ -18,7 +18,7 @@
     // content.
     //
     async function verifyIframeInnerHtml(string) {
-      var iframeInnerHtml = await SpecialPowers.spawn(document.getElementById("content"), [string], (string) =>
+      var iframeInnerHtml = await SpecialPowers.spawn(document.getElementById("content"), [string], () =>
           content.document.getElementById("iframe").contentDocument.body.innerHTML);
       ok(iframeInnerHtml.includes(string),
          "iframe contains wrong document: " + iframeInnerHtml);
diff --git a/docshell/test/chrome/bug449778_window.xhtml b/docshell/test/chrome/bug449778_window.xhtml
index 3197b7acf4..0a4a6465a8 100644
--- a/docshell/test/chrome/bug449778_window.xhtml
+++ b/docshell/test/chrome/bug449778_window.xhtml
@@ -42,7 +42,7 @@
     function doTheTest() {
       var strs = { "f1": "", "f2" : "" };
       function attachListener(node, type) {
-        var listener = function(e) {
+        var listener = function() {
           if (strs[node.id]) strs[node.id] += " ";
           strs[node.id] += node.id + ".page" + type;
         }
diff --git a/docshell/test/chrome/docshell_helpers.js b/docshell/test/chrome/docshell_helpers.js
index 7f16708087..79d92385a8 100644
--- a/docshell/test/chrome/docshell_helpers.js
+++ b/docshell/test/chrome/docshell_helpers.js
@@ -230,6 +230,12 @@ function doPageNavigation(params) {
         observers: observers.keys(),
       },
       allFrames: true,
+      // We avoid messages from system addons event pages here, as
+      // the tests test_bug321671.xhtml and test_bug690056.xhtml do
+      // not expect those events, and so will intermittently fail.
+      // They require messages from "browsers", "test", and "" to pass.
+      // See bug 1784831 and bug 1883434 for more context.
+      messageManagerGroups: ["browsers", "test", ""],
     });
     DocShellHelpersParent.eventsToListenFor = eventsToListenFor;
     DocShellHelpersParent.observers = observers;
@@ -269,11 +275,7 @@ function doPageNavigation(params) {
   if (cleanup) {
     // Register a cleanup function on domwindowclosed, to avoid contaminating
     // other tests if we bail out early because of an error.
-    Services.ww.registerNotification(function windowClosed(
-      subject,
-      topic,
-      data
-    ) {
+    Services.ww.registerNotification(function windowClosed(subject, topic) {
       if (topic == "domwindowclosed" && subject == window) {
         Services.ww.unregisterNotification(windowClosed);
         cleanup();
@@ -596,7 +598,7 @@ function finish() {
   let SimpleTest = opener.wrappedJSObject.SimpleTest;
 
   // Wait for the window to be closed before finishing the test
-  Services.ww.registerNotification(function observer(subject, topic, data) {
+  Services.ww.registerNotification(function observer(subject, topic) {
     if (topic == "domwindowclosed") {
       Services.ww.unregisterNotification(observer);
       SimpleTest.waitForFocus(SimpleTest.finish, opener);
diff --git a/docshell/test/chrome/mozFrameType_window.xhtml b/docshell/test/chrome/mozFrameType_window.xhtml
index e5d0126d22..4264462c32 100644
--- a/docshell/test/chrome/mozFrameType_window.xhtml
+++ b/docshell/test/chrome/mozFrameType_window.xhtml
@@ -30,7 +30,7 @@
         // First focus the parent window and then close this one.
         SimpleTest.waitForFocus(function() {
           let ww = SpecialPowers.Services.ww;
-          ww.registerNotification(function windowObs(subject, topic, data) {
+          ww.registerNotification(function windowObs(subject, topic) {
             if (topic == "domwindowclosed") {
               ww.unregisterNotification(windowObs);
 
diff --git a/docshell/test/chrome/test_bug565388.xhtml b/docshell/test/chrome/test_bug565388.xhtml
index 4da580c117..06f2645c5d 100644
--- a/docshell/test/chrome/test_bug565388.xhtml
+++ b/docshell/test/chrome/test_bug565388.xhtml
@@ -35,7 +35,7 @@ function test() {
       this.callback();
     },
 
-    onStateChange (webProgress, req, flags, status) {
+    onStateChange (webProgress, req, flags) {
       if (req.name.startsWith("data:application/vnd.mozilla.xul")) {
         if (flags & Ci.nsIWebProgressListener.STATE_STOP)
           this.finish();
diff --git a/docshell/test/chrome/test_bug789773.xhtml b/docshell/test/chrome/test_bug789773.xhtml
index 196d40e12d..f378f7a77b 100644
--- a/docshell/test/chrome/test_bug789773.xhtml
+++ b/docshell/test/chrome/test_bug789773.xhtml
@@ -33,7 +33,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=789773
   var calledListenerForBrowserChromeURL = false;
   var testProgressListener = {
     START_DOC: Ci.nsIWebProgressListener.STATE_START | Ci.nsIWebProgressListener.STATE_IS_DOCUMENT,
-    onStateChange(wp, req, stateFlags, status) {
+    onStateChange(wp, req, stateFlags) {
       let browserChromeFileName = AppConstants.BROWSER_CHROME_URL.split("/").reverse()[0];
       if (req.name.includes(browserChromeFileName)) {
         wp.DOMWindow; // Force the lazy creation of a DOM window.
diff --git a/docshell/test/chrome/test_bug909218.html b/docshell/test/chrome/test_bug909218.html
index bcbcc176eb..7b20b3a8ad 100644
--- a/docshell/test/chrome/test_bug909218.html
+++ b/docshell/test/chrome/test_bug909218.html
@@ -83,7 +83,7 @@ var RequestWatcher = {
     this.callback();
   },
 
-  onStateChange(webProgress, req, flags, status) {
+  onStateChange(webProgress, req, flags) {
     // We are checking requests - if there isn't one, ignore it.
     if (!req) {
       return;
diff --git a/docshell/test/chrome/test_docRedirect.xhtml b/docshell/test/chrome/test_docRedirect.xhtml
index 56fdc1c5d2..7cb61cc464 100644
--- a/docshell/test/chrome/test_docRedirect.xhtml
+++ b/docshell/test/chrome/test_docRedirect.xhtml
@@ -42,7 +42,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1342989
       this.callback(success);
     },
 
-    onStateChange (webProgress, req, flags, status) {
+    onStateChange (webProgress, req, flags) {
       if (!(flags & Ci.nsIWebProgressListener.STATE_IS_DOCUMENT) &&
           !(flags & Ci.nsIWebProgressListener.STATE_IS_REDIRECTED_DOCUMENT))
         return;
diff --git a/docshell/test/chrome/test_viewsource_forbidden_in_iframe.xhtml b/docshell/test/chrome/test_viewsource_forbidden_in_iframe.xhtml
index 0cc45c7821..d35d9400ce 100644
--- a/docshell/test/chrome/test_viewsource_forbidden_in_iframe.xhtml
+++ b/docshell/test/chrome/test_viewsource_forbidden_in_iframe.xhtml
@@ -37,7 +37,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=624883
           }
         },
 
-        onStateChange(aWebProgress, aRequest, aStateFlags, aStatus) {
+        onStateChange(aWebProgress) {
           // Wait until the documentURI changes (from about:blank) this should
           // be the error page URI.
           var documentURI = frame.contentDocument.documentURI;