Merging upstream version 125.0.1.

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

7 files changed, 13 insertions, 13 deletions

diff --git a/netwerk/test/mochitests/file_1331680.js b/netwerk/test/mochitests/file_1331680.js
index 868d6991ae..c99e1d399d 100644
--- a/netwerk/test/mochitests/file_1331680.js
+++ b/netwerk/test/mochitests/file_1331680.js
@@ -13,12 +13,12 @@ var observer = {
   },
 };
 
-addMessageListener("createObserver", function (e) {
+addMessageListener("createObserver", function () {
   Services.obs.addObserver(observer, "cookie-changed");
   sendAsyncMessage("createObserver:return");
 });
 
-addMessageListener("removeObserver", function (e) {
+addMessageListener("removeObserver", function () {
   Services.obs.removeObserver(observer, "cookie-changed");
   sendAsyncMessage("removeObserver:return");
 });
diff --git a/netwerk/test/mochitests/test_1396395.html b/netwerk/test/mochitests/test_1396395.html
index dcfb952b3a..ecbd01da16 100644
--- a/netwerk/test/mochitests/test_1396395.html
+++ b/netwerk/test/mochitests/test_1396395.html
@@ -13,7 +13,7 @@ SimpleTest.waitForExplicitFinish();
 
 var script = SpecialPowers.loadChromeScript(() => {
   /* eslint-env mozilla/chrome-script */
-  Services.obs.addObserver(function onExamResp(subject, topic, data) {
+  Services.obs.addObserver(function onExamResp(subject) {
     let channel = subject.QueryInterface(Ci.nsIHttpChannel);
     if (!channel.URI.spec.startsWith("http://example.org")) {
       return;
diff --git a/netwerk/test/mochitests/test_idn_redirect.html b/netwerk/test/mochitests/test_idn_redirect.html
index cc920665b3..8445f440e8 100644
--- a/netwerk/test/mochitests/test_idn_redirect.html
+++ b/netwerk/test/mochitests/test_idn_redirect.html
@@ -24,7 +24,7 @@ iframe.addEventListener("load", finishTest);
 document.body.appendChild(iframe);
 iframe.src = "http://mochi.test:8888/tests/netwerk/test/mochitests/redirect_idn.html";
 
-function finishTest(e) {
+function finishTest() {
   ok(true);
   SimpleTest.finish();
 }
diff --git a/netwerk/test/mochitests/test_origin_header.html b/netwerk/test/mochitests/test_origin_header.html
index f90887ddf0..4d096e75c6 100644
--- a/netwerk/test/mochitests/test_origin_header.html
+++ b/netwerk/test/mochitests/test_origin_header.html
@@ -193,7 +193,7 @@ function frameLoaded(test, check)
 
 function submitForm(test, check)
 {
-     return new Promise((resolve, reject) => {
+     return new Promise((resolve) => {
          document.getElementById(check.frameID).onload = () => {
              frameLoaded(test, check);
              resolve();
@@ -204,7 +204,7 @@ function submitForm(test, check)
 
 function loadIframe(test, check)
 {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
         let frame = SpecialPowers.wrap(window.document.getElementById(check.frameID));
         frame.onload = function () {
             // Ignore the first load and wait for the submitted form instead.
@@ -220,7 +220,7 @@ function loadIframe(test, check)
 
 function loadSrcDocFrame(test, check)
 {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
         let frame = SpecialPowers.wrap(window.document.getElementById(check.frameID));
         frame.onload = function () {
             // Ignore the first load and wait for the submitted form instead.
@@ -240,7 +240,7 @@ function loadSrcDocFrame(test, check)
 
 function loadDataURIFrame(test, check)
 {
-    return new Promise((resolve, reject) => {
+    return new Promise((resolve) => {
         let frame = SpecialPowers.wrap(window.document.getElementById(check.frameID));
         frame.onload = function () {
             // Ignore the first load and wait for the submitted form instead.
@@ -262,7 +262,7 @@ async function resetFrames()
 {
     let checkPromises = [];
     for (let check of checksToRun) {
-        checkPromises.push(new Promise((resolve, reject) => {
+        checkPromises.push(new Promise((resolve) => {
             let frame = document.getElementById(check.frameID);
             frame.onload = () => resolve();
             if (check.srcdoc) {
diff --git a/netwerk/test/mochitests/test_partially_cached_content.html b/netwerk/test/mochitests/test_partially_cached_content.html
index 8b6df555f8..8dc93e2c81 100644
--- a/netwerk/test/mochitests/test_partially_cached_content.html
+++ b/netwerk/test/mochitests/test_partially_cached_content.html
@@ -26,7 +26,7 @@
 
 /* Check that the iframe has initial content only after the first load.
  */
-function expectInitialContent(e) {
+function expectInitialContent() {
   info("expectInitialContent",
        "First response received: should have partial content");
   var frameElement = document.getElementById('contentFrame');
@@ -57,7 +57,7 @@ function expectInitialContent(e) {
 
 /* Check that the iframe has all the content after the second load.
  */
-function expectFullContent(e)
+function expectFullContent()
 {
   info("expectFullContent",
        "Second response received: should complete content from first load");
diff --git a/netwerk/test/mochitests/test_redirect_ref.html b/netwerk/test/mochitests/test_redirect_ref.html
index 0b234695d4..33f4031d28 100644
--- a/netwerk/test/mochitests/test_redirect_ref.html
+++ b/netwerk/test/mochitests/test_redirect_ref.html
@@ -18,7 +18,7 @@ iframe.addEventListener("load", finishTest);
 document.body.appendChild(iframe);
 iframe.src = "redirect.sjs#start";
 
-function finishTest(e) {
+function finishTest() {
   is(iframe.contentWindow.location.href, "http://mochi.test:8888/tests/netwerk/test/mochitests/empty.html#");
   SimpleTest.finish();
 }
diff --git a/netwerk/test/mochitests/test_rel_preconnect.html b/netwerk/test/mochitests/test_rel_preconnect.html
index c7e0bada07..a0c3309954 100644
--- a/netwerk/test/mochitests/test_rel_preconnect.html
+++ b/netwerk/test/mochitests/test_rel_preconnect.html
@@ -19,7 +19,7 @@ async function doTest()
 {
   await SpecialPowers.setBoolPref("network.http.debug-observations", true);
 
-  observer = SpecialPowers.wrapCallback(function(subject, topic, data) {
+  observer = SpecialPowers.wrapCallback(function() {
     remainder--;
     ok(true, "observed remainder = " + remainder);
     if (!remainder) {