From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 toolkit/components/pdfjs/test/browser_pdfjs_editing_contextmenu.js | 2 +-
 toolkit/components/pdfjs/test/browser_pdfjs_find.js                | 2 +-
 toolkit/components/pdfjs/test/browser_pdfjs_force_opening_files.js | 4 ++--
 toolkit/components/pdfjs/test/browser_pdfjs_fullscreen.js          | 2 +-
 toolkit/components/pdfjs/test/browser_pdfjs_navigation.js          | 2 +-
 toolkit/components/pdfjs/test/browser_pdfjs_octet_stream.js        | 2 +-
 toolkit/components/pdfjs/test/browser_pdfjs_savedialog.js          | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'toolkit/components/pdfjs/test')

diff --git a/toolkit/components/pdfjs/test/browser_pdfjs_editing_contextmenu.js b/toolkit/components/pdfjs/test/browser_pdfjs_editing_contextmenu.js
index 779a3a6ad4..f13d03d643 100644
--- a/toolkit/components/pdfjs/test/browser_pdfjs_editing_contextmenu.js
+++ b/toolkit/components/pdfjs/test/browser_pdfjs_editing_contextmenu.js
@@ -130,7 +130,7 @@ function assertMenuitems(menuitems, expected) {
         elmt =>
           !elmt.id.includes("-sep-") &&
           !elmt.hidden &&
-          ["", "false"].includes(elmt.getAttribute("disabled"))
+          [null, "false"].includes(elmt.getAttribute("disabled"))
       )
       .map(elmt => elmt.id),
     expected
diff --git a/toolkit/components/pdfjs/test/browser_pdfjs_find.js b/toolkit/components/pdfjs/test/browser_pdfjs_find.js
index 24a3a50967..b3b3e11152 100644
--- a/toolkit/components/pdfjs/test/browser_pdfjs_find.js
+++ b/toolkit/components/pdfjs/test/browser_pdfjs_find.js
@@ -13,7 +13,7 @@ const OS_PDF_URL = TESTROOT + "file_pdfjs_object_stream.pdf";
 const TEST_PDF_URL = TESTROOT + "file_pdfjs_test.pdf";
 
 add_task(async function test_find_octet_stream_pdf() {
-  await BrowserTestUtils.withNewTab(OS_PDF_URL, async browser => {
+  await BrowserTestUtils.withNewTab(OS_PDF_URL, async () => {
     let findEls = ["cmd_find", "cmd_findAgain", "cmd_findPrevious"].map(id =>
       document.getElementById(id)
     );
diff --git a/toolkit/components/pdfjs/test/browser_pdfjs_force_opening_files.js b/toolkit/components/pdfjs/test/browser_pdfjs_force_opening_files.js
index 0490a6eec3..f09581daa7 100644
--- a/toolkit/components/pdfjs/test/browser_pdfjs_force_opening_files.js
+++ b/toolkit/components/pdfjs/test/browser_pdfjs_force_opening_files.js
@@ -13,7 +13,7 @@ add_task(async function test_file_opening() {
   // the default - because files from disk should always use pdfjs, unless
   // it is forcibly disabled.
   let openedWindow = false;
-  let windowOpenedPromise = new Promise((resolve, reject) => {
+  let windowOpenedPromise = new Promise(resolve => {
     addWindowListener(
       "chrome://mozapps/content/downloads/unknownContentType.xhtml",
       () => {
@@ -82,7 +82,7 @@ function addWindowListener(aURL, aCallback) {
         aCallback();
       }, domwindow);
     },
-    onCloseWindow(aXULWindow) {},
+    onCloseWindow() {},
   };
   Services.wm.addListener(listener);
   listenerCleanup = () => Services.wm.removeListener(listener);
diff --git a/toolkit/components/pdfjs/test/browser_pdfjs_fullscreen.js b/toolkit/components/pdfjs/test/browser_pdfjs_fullscreen.js
index d53e4cfa74..4add7a4715 100644
--- a/toolkit/components/pdfjs/test/browser_pdfjs_fullscreen.js
+++ b/toolkit/components/pdfjs/test/browser_pdfjs_fullscreen.js
@@ -8,7 +8,7 @@ function waitForFullScreenState(browser, state) {
   return new Promise(resolve => {
     let eventReceived = false;
 
-    let observe = (subject, topic, data) => {
+    let observe = () => {
       if (!eventReceived) {
         return;
       }
diff --git a/toolkit/components/pdfjs/test/browser_pdfjs_navigation.js b/toolkit/components/pdfjs/test/browser_pdfjs_navigation.js
index 9851150e80..5fda1ac8b2 100644
--- a/toolkit/components/pdfjs/test/browser_pdfjs_navigation.js
+++ b/toolkit/components/pdfjs/test/browser_pdfjs_navigation.js
@@ -229,7 +229,7 @@ async function contentSetUp() {
     return new Promise(resolve => {
       document.addEventListener(
         "pagerendered",
-        function (e) {
+        function () {
           document.querySelector("#viewer").click();
           resolve();
         },
diff --git a/toolkit/components/pdfjs/test/browser_pdfjs_octet_stream.js b/toolkit/components/pdfjs/test/browser_pdfjs_octet_stream.js
index d2b4fe310f..8e81ddb2c5 100644
--- a/toolkit/components/pdfjs/test/browser_pdfjs_octet_stream.js
+++ b/toolkit/components/pdfjs/test/browser_pdfjs_octet_stream.js
@@ -88,7 +88,7 @@ add_task(async function test_octet_stream_in_frame() {
 
   await BrowserTestUtils.withNewTab(
     { gBrowser, url: `data:text/html,<iframe src='${PDF_URL}'>` },
-    async function (newTabBrowser) {
+    async function () {
       // wait until downloadsPanel opens before continuing with test
       info("Waiting for download panel to open");
       await downloadsPanelPromise;
diff --git a/toolkit/components/pdfjs/test/browser_pdfjs_savedialog.js b/toolkit/components/pdfjs/test/browser_pdfjs_savedialog.js
index 4f0c952ebb..e514eaf530 100644
--- a/toolkit/components/pdfjs/test/browser_pdfjs_savedialog.js
+++ b/toolkit/components/pdfjs/test/browser_pdfjs_savedialog.js
@@ -48,6 +48,6 @@ function addWindowListener(aURL, aCallback) {
         aCallback();
       }, domwindow);
     },
-    onCloseWindow(aXULWindow) {},
+    onCloseWindow() {},
   });
 }
-- 
cgit v1.2.3