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>
---
 devtools/client/jsonview/test/browser_jsonview_content_type.js    | 2 +-
 devtools/client/jsonview/test/browser_jsonview_expand_collapse.js | 2 +-
 devtools/client/jsonview/test/browser_jsonview_save_json.js       | 2 +-
 devtools/client/jsonview/test/browser_jsonview_serviceworker.js   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'devtools/client/jsonview/test')

diff --git a/devtools/client/jsonview/test/browser_jsonview_content_type.js b/devtools/client/jsonview/test/browser_jsonview_content_type.js
index c3298cc7d9..f72ac14b5d 100644
--- a/devtools/client/jsonview/test/browser_jsonview_content_type.js
+++ b/devtools/client/jsonview/test/browser_jsonview_content_type.js
@@ -34,7 +34,7 @@ add_task(async function () {
   );
   SpecialPowers.setBoolPref("browser.download.useDownloadDir", false);
   const { MockFilePicker } = SpecialPowers;
-  MockFilePicker.init(window);
+  MockFilePicker.init(window.browsingContext);
   MockFilePicker.returnValue = MockFilePicker.returnCancel;
 
   for (const kind of Object.keys(contentTypes)) {
diff --git a/devtools/client/jsonview/test/browser_jsonview_expand_collapse.js b/devtools/client/jsonview/test/browser_jsonview_expand_collapse.js
index 46ce800b1f..04e0834f2a 100644
--- a/devtools/client/jsonview/test/browser_jsonview_expand_collapse.js
+++ b/devtools/client/jsonview/test/browser_jsonview_expand_collapse.js
@@ -45,7 +45,7 @@ add_task(async function () {
   const json = JSON.stringify({
     data: Array(1e5)
       .fill()
-      .map(x => "hoot"),
+      .map(() => "hoot"),
     status: "ok",
   });
   Assert.greater(
diff --git a/devtools/client/jsonview/test/browser_jsonview_save_json.js b/devtools/client/jsonview/test/browser_jsonview_save_json.js
index 506967df00..d83741685e 100644
--- a/devtools/client/jsonview/test/browser_jsonview_save_json.js
+++ b/devtools/client/jsonview/test/browser_jsonview_save_json.js
@@ -8,7 +8,7 @@ const saveButton = "button.save";
 const prettifyButton = "button.prettyprint";
 
 const { MockFilePicker } = SpecialPowers;
-MockFilePicker.init(window);
+MockFilePicker.init(window.browsingContext);
 MockFilePicker.returnValue = MockFilePicker.returnOK;
 
 Services.scriptloader.loadSubScript(
diff --git a/devtools/client/jsonview/test/browser_jsonview_serviceworker.js b/devtools/client/jsonview/test/browser_jsonview_serviceworker.js
index 3d68cad065..c8be1a939a 100644
--- a/devtools/client/jsonview/test/browser_jsonview_serviceworker.js
+++ b/devtools/client/jsonview/test/browser_jsonview_serviceworker.js
@@ -34,7 +34,7 @@ add_task(async function () {
           resolve();
           return;
         }
-        worker.addEventListener("statechange", evt => {
+        worker.addEventListener("statechange", () => {
           if (worker.state === "activated") {
             resolve();
           }
-- 
cgit v1.2.3