From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:13:33 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 dom/ipc/tests/JSWindowActor/browser.toml                 | 5 ++++-
 dom/ipc/tests/JSWindowActor/browser_crash_report.js      | 2 +-
 dom/ipc/tests/JSWindowActor/browser_destroy_callbacks.js | 4 ++--
 dom/ipc/tests/JSWindowActor/browser_getActor_filter.js   | 4 ++--
 dom/ipc/tests/browser_child_clipboard_restricted.js      | 2 +-
 dom/ipc/tests/browser_gc_schedule.js                     | 4 ++--
 dom/ipc/tests/browser_wpi_base.js                        | 4 ++--
 dom/ipc/tests/file_broadcast_currenturi_onload.html      | 2 +-
 dom/ipc/tests/file_endless_js.html                       | 2 +-
 dom/ipc/tests/process_error.xhtml                        | 2 +-
 dom/ipc/tests/test_bug1086684.js                         | 2 +-
 dom/ipc/tests/test_temporaryfile_stream.html             | 2 +-
 dom/ipc/tests/test_window_open_discarded_bc.html         | 2 +-
 13 files changed, 20 insertions(+), 17 deletions(-)

(limited to 'dom/ipc/tests')

diff --git a/dom/ipc/tests/JSWindowActor/browser.toml b/dom/ipc/tests/JSWindowActor/browser.toml
index a9dc7e8b8f..5f406464f4 100644
--- a/dom/ipc/tests/JSWindowActor/browser.toml
+++ b/dom/ipc/tests/JSWindowActor/browser.toml
@@ -6,7 +6,10 @@ support-files = ["head.js"]
 ["browser_crash_report.js"]
 
 ["browser_destroy_callbacks.js"]
-skip-if = ["!debug && os == 'mac'"] #Bug 1604538
+skip-if = [
+  "apple_catalina && !debug", #Bug 1604538
+  "apple_silicon && !debug", #Bug 1604538
+]
 
 ["browser_event_listener.js"]
 support-files = ["file_dummyChromePage.html"]
diff --git a/dom/ipc/tests/JSWindowActor/browser_crash_report.js b/dom/ipc/tests/JSWindowActor/browser_crash_report.js
index f029f1a85a..d2b2b3a694 100644
--- a/dom/ipc/tests/JSWindowActor/browser_crash_report.js
+++ b/dom/ipc/tests/JSWindowActor/browser_crash_report.js
@@ -5,7 +5,7 @@ http://creativecommons.org/publicdomain/zero/1.0/ */
 declTest("crash actor", {
   allFrames: true,
 
-  async test(browser) {
+  async test() {
     if (!("@mozilla.org/toolkit/crash-reporter;1" in Cc)) {
       ok(true, "Cannot test crash annotations without a crash reporter");
       return;
diff --git a/dom/ipc/tests/JSWindowActor/browser_destroy_callbacks.js b/dom/ipc/tests/JSWindowActor/browser_destroy_callbacks.js
index 74cbae9415..e92de1b82f 100644
--- a/dom/ipc/tests/JSWindowActor/browser_destroy_callbacks.js
+++ b/dom/ipc/tests/JSWindowActor/browser_destroy_callbacks.js
@@ -142,7 +142,7 @@ declTest("destroy actor by page navigates", {
 declTest("destroy actor by tab being closed", {
   allFrames: true,
 
-  async test(browser) {
+  async test() {
     info("creating a new tab");
     let newTab = await BrowserTestUtils.openNewForegroundTab(gBrowser, URL);
     let newTabBrowser = newTab.linkedBrowser;
@@ -158,7 +158,7 @@ declTest("destroy actor by tab being closed", {
     let didDestroyPromise = new Promise(resolve => {
       Services.ppmm.addMessageListener(
         "test-jswindowactor-diddestroy",
-        function onmessage(msg) {
+        function onmessage() {
           Services.ppmm.removeMessageListener(
             "test-jswindowactor-diddestroy",
             onmessage
diff --git a/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js b/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js
index a10697c989..691cffe603 100644
--- a/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js
+++ b/dom/ipc/tests/JSWindowActor/browser_getActor_filter.js
@@ -169,7 +169,7 @@ declTest("getActor with iframe messageManagerGroups match", {
     let parent = browser.browsingContext.currentWindowGlobal;
     ok(parent.getActor("TestWindow"), "JSWindowActorParent should have value.");
 
-    await SpecialPowers.spawn(browser, [TEST_URL], async function (url) {
+    await SpecialPowers.spawn(browser, [TEST_URL], async function () {
       let child = content.windowGlobalChild;
       ok(child, "WindowGlobalChild should have value.");
       ok(child.getActor("TestWindow"), "JSWindowActorChild should have value.");
@@ -189,7 +189,7 @@ declTest("getActor with iframe messageManagerGroups mismatch", {
       "Should throw if its messageManagerGroups doesn't match."
     );
 
-    await SpecialPowers.spawn(browser, [TEST_URL], async function (url) {
+    await SpecialPowers.spawn(browser, [TEST_URL], async function () {
       let child = content.windowGlobalChild;
       ok(child, "WindowGlobalChild should have value.");
       Assert.throws(
diff --git a/dom/ipc/tests/browser_child_clipboard_restricted.js b/dom/ipc/tests/browser_child_clipboard_restricted.js
index be2d1bca9c..6fd062d559 100644
--- a/dom/ipc/tests/browser_child_clipboard_restricted.js
+++ b/dom/ipc/tests/browser_child_clipboard_restricted.js
@@ -9,7 +9,7 @@ add_task(async function () {
   );
   let browser = tab.linkedBrowser;
 
-  await SpecialPowers.spawn(browser, [], async function (arg) {
+  await SpecialPowers.spawn(browser, [], async function () {
     const trans = Cc["@mozilla.org/widget/transferable;1"].createInstance(
       Ci.nsITransferable
     );
diff --git a/dom/ipc/tests/browser_gc_schedule.js b/dom/ipc/tests/browser_gc_schedule.js
index 8b44c98eae..e1381f82c0 100644
--- a/dom/ipc/tests/browser_gc_schedule.js
+++ b/dom/ipc/tests/browser_gc_schedule.js
@@ -15,7 +15,7 @@ async function waitForGCBegin() {
   // This fixes a ReferenceError for Date, it's weird.
   ok(Date.now(), "Date.now()");
   var when = await new Promise(resolve => {
-    observer.observe = function (subject, topic, data) {
+    observer.observe = function () {
       resolve(Date.now());
     };
 
@@ -40,7 +40,7 @@ async function waitForGCEnd() {
   // This fixes a ReferenceError for Date, it's weird.
   ok(Date.now(), "Date.now()");
   let when = await new Promise(resolve => {
-    observer.observe = function (subject, topic, data) {
+    observer.observe = function () {
       resolve(Date.now());
     };
 
diff --git a/dom/ipc/tests/browser_wpi_base.js b/dom/ipc/tests/browser_wpi_base.js
index 7a01c9a161..f09255a99c 100644
--- a/dom/ipc/tests/browser_wpi_base.js
+++ b/dom/ipc/tests/browser_wpi_base.js
@@ -183,7 +183,7 @@ const heuristics = [
   },
   {
     name: "hasSavedLogin",
-    setup_com: async expected => {
+    setup_com: async () => {
       // add .com to the password manager
       let LoginInfo = new Components.Constructor(
         "@mozilla.org/login-manager/loginInfo;1",
@@ -208,7 +208,7 @@ const heuristics = [
   },
   {
     name: "isLoggedIn",
-    setup_com: async expected => {
+    setup_com: async () => {
       let p = new Promise(resolve => {
         Services.obs.addObserver(function obs() {
           Services.obs.removeObserver(
diff --git a/dom/ipc/tests/file_broadcast_currenturi_onload.html b/dom/ipc/tests/file_broadcast_currenturi_onload.html
index b92c46c944..e258fbdf83 100644
--- a/dom/ipc/tests/file_broadcast_currenturi_onload.html
+++ b/dom/ipc/tests/file_broadcast_currenturi_onload.html
@@ -33,7 +33,7 @@ async function getURIs() {
   return { location: location.href, docURI, curURI };
 }
 
-addEventListener("load", async e => {
+addEventListener("load", async () => {
   // If a payload parameter was included, just send the message.
   const payloadStr = url.searchParams.get("payload");
   if (payloadStr) {
diff --git a/dom/ipc/tests/file_endless_js.html b/dom/ipc/tests/file_endless_js.html
index 926fb1d8ab..338cea5e57 100644
--- a/dom/ipc/tests/file_endless_js.html
+++ b/dom/ipc/tests/file_endless_js.html
@@ -2,7 +2,7 @@
 <html>
 <head><meta charset="utf-8"></head>
 <script>
-  function hang(m) {
+  function hang() {
     let i = 1;
     while (i > 0) {
       i = Date.now();
diff --git a/dom/ipc/tests/process_error.xhtml b/dom/ipc/tests/process_error.xhtml
index 3d57a3f456..8dea882c78 100644
--- a/dom/ipc/tests/process_error.xhtml
+++ b/dom/ipc/tests/process_error.xhtml
@@ -25,7 +25,7 @@
       let browser = document.getElementById('thebrowser');
 
       let observerPromise = new Promise(resolve => {
-        let crashObserver = (subject, topic, data) => {
+        let crashObserver = (subject, topic) => {
           is(topic, 'ipc:content-shutdown', 'Received correct observer topic.');
           ok(subject instanceof Ci.nsIPropertyBag2,
              'Subject implements nsIPropertyBag2.');
diff --git a/dom/ipc/tests/test_bug1086684.js b/dom/ipc/tests/test_bug1086684.js
index 8a34906686..218d2b14a6 100644
--- a/dom/ipc/tests/test_bug1086684.js
+++ b/dom/ipc/tests/test_bug1086684.js
@@ -37,7 +37,7 @@ function childFrameScript() {
   );
 
   function parentReady(message) {
-    MockFilePicker.init(content);
+    MockFilePicker.init(content.browsingContext);
     MockFilePicker.setFiles([message.data.file]);
     MockFilePicker.returnValue = MockFilePicker.returnOK;
 
diff --git a/dom/ipc/tests/test_temporaryfile_stream.html b/dom/ipc/tests/test_temporaryfile_stream.html
index 9fa76a2155..1a0cfcaef4 100644
--- a/dom/ipc/tests/test_temporaryfile_stream.html
+++ b/dom/ipc/tests/test_temporaryfile_stream.html
@@ -54,7 +54,7 @@ function startTest() {
       video.id = "recorded-video";
       video.src = URL.createObjectURL(xhr.response);
       video.play();
-      video.onerror = err => {
+      video.onerror = () => {
         ok(false, "Should be able to play the recording. Got error. code=" + video.error.code);
         SimpleTest.finish();
       };
diff --git a/dom/ipc/tests/test_window_open_discarded_bc.html b/dom/ipc/tests/test_window_open_discarded_bc.html
index 4cd81463e0..fae731d068 100644
--- a/dom/ipc/tests/test_window_open_discarded_bc.html
+++ b/dom/ipc/tests/test_window_open_discarded_bc.html
@@ -11,7 +11,7 @@ add_task(async function() {
   const TOPIC = "dangerous:test-only:new-browser-child-ready";
 
   let found = false;
-  function observer(subject, topic, data) {
+  function observer(subject) {
     let win = SpecialPowers.wrap(subject);
     if (SpecialPowers.compare(win.opener, window)) {
       found = true;
-- 
cgit v1.2.3