Merging upstream version 126.0.

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

12 files changed, 18 insertions, 18 deletions

diff --git a/browser/components/privatebrowsing/test/browser/browser_oa_private_browsing_window.js b/browser/components/privatebrowsing/test/browser/browser_oa_private_browsing_window.js
index a1b9420171..818c412ef6 100644
--- a/browser/components/privatebrowsing/test/browser/browser_oa_private_browsing_window.js
+++ b/browser/components/privatebrowsing/test/browser/browser_oa_private_browsing_window.js
@@ -9,7 +9,7 @@ const DUMMY_PAGE = PATH + "empty_file.html";
 
 add_task(
   async function test_principal_right_click_open_link_in_new_private_win() {
-    await BrowserTestUtils.withNewTab(TEST_PAGE, async function (browser) {
+    await BrowserTestUtils.withNewTab(TEST_PAGE, async function () {
       let promiseNewWindow = BrowserTestUtils.waitForNewWindow({
         url: DUMMY_PAGE,
       });
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_nimbus_dismiss.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_nimbus_dismiss.js
index bfe5708a5b..ef207916a5 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_nimbus_dismiss.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_nimbus_dismiss.js
@@ -41,7 +41,7 @@ add_task(async function test_experiment_messaging_system_dismiss() {
 
   let { win: win1, tab: tab1 } = await openTabAndWaitForRender();
 
-  await SpecialPowers.spawn(tab1, [LOCALE], async function (locale) {
+  await SpecialPowers.spawn(tab1, [LOCALE], async function () {
     content.document.querySelector("#dismiss-btn").click();
     info("button clicked");
   });
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_nimbus_impressions.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_nimbus_impressions.js
index ac42caa2dd..0d4b0a1dbb 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_nimbus_impressions.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_about_nimbus_impressions.js
@@ -47,7 +47,7 @@ add_task(async function test_experiment_messaging_system_impressions() {
 
   let { win: win1, tab: tab1 } = await openTabAndWaitForRender();
 
-  await SpecialPowers.spawn(tab1, [LOCALE], async function (locale) {
+  await SpecialPowers.spawn(tab1, [LOCALE], async function () {
     is(
       content.document
         .querySelector(".promo button")
@@ -72,7 +72,7 @@ add_task(async function test_experiment_messaging_system_impressions() {
 
   let { win: win2, tab: tab2 } = await openTabAndWaitForRender();
 
-  await SpecialPowers.spawn(tab2, [LOCALE], async function (locale) {
+  await SpecialPowers.spawn(tab2, [LOCALE], async function () {
     is(
       content.document
         .querySelector(".promo button")
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cache.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cache.js
index de6aa1f6ba..9d274a28de 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cache.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cache.js
@@ -46,7 +46,7 @@ function getStorageEntryCount(device, goon) {
 
   var visitor = {
     entryCount: 0,
-    onCacheStorageInfo(aEntryCount, aConsumption) {},
+    onCacheStorageInfo() {},
     onCacheEntryInfo(uri) {
       var urispec = uri.asciiSpec;
       info(device + ":" + urispec + "\n");
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js
index 9b796613a9..acdb4bb30d 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_certexceptionsui.js
@@ -31,7 +31,7 @@ function test() {
     };
     function testCheckbox() {
       win.removeEventListener("load", testCheckbox);
-      Services.obs.addObserver(function onCertUI(aSubject, aTopic, aData) {
+      Services.obs.addObserver(function onCertUI() {
         Services.obs.removeObserver(onCertUI, "cert-exception-ui-ready");
         ok(win.gCert, "The certificate information should be available now");
 
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cleanup.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cleanup.js
index 39e41589b4..ce86cab69c 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cleanup.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_cleanup.js
@@ -19,7 +19,7 @@ add_task(async () => {
   await BrowserTestUtils.browserLoaded(privateTab);
 
   let observerExited = {
-    observe(aSubject, aTopic, aData) {
+    observe() {
       ok(false, "Notification received!");
     },
   };
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js
index eea0ab07ca..46ef974677 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_favicon.js
@@ -32,7 +32,7 @@ function clearAllPlacesFavicons() {
 
   return new Promise(resolve => {
     let observer = {
-      observe(aSubject, aTopic, aData) {
+      observe(aSubject, aTopic) {
         if (aTopic === "places-favicons-expired") {
           resolve();
           Services.obs.removeObserver(observer, "places-favicons-expired");
@@ -59,7 +59,7 @@ function observeFavicon(aIsPrivate, aExpectedCookie, aPageURI) {
 
   return new Promise(resolve => {
     let observer = {
-      observe(aSubject, aTopic, aData) {
+      observe(aSubject, aTopic) {
         // Make sure that the topic is 'http-on-modify-request'.
         if (aTopic === "http-on-modify-request") {
           // We check the privateBrowsingId for the originAttributes of the loading
@@ -121,7 +121,7 @@ function observeFavicon(aIsPrivate, aExpectedCookie, aPageURI) {
 function waitOnFaviconResponse(aFaviconURL) {
   return new Promise(resolve => {
     let observer = {
-      observe(aSubject, aTopic, aData) {
+      observe(aSubject, aTopic) {
         if (
           aTopic === "http-on-examine-response" ||
           aTopic === "http-on-examine-cached-response"
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt_page.html b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt_page.html
index 01ed3f3d2c..e7c1920215 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt_page.html
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_geoprompt_page.html
@@ -5,7 +5,7 @@
   </head>
   <body>
     <script type="text/javascript">
-      navigator.geolocation.getCurrentPosition(function(pos) {
+      navigator.geolocation.getCurrentPosition(function() {
         // ignore
       });
     </script>
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_last_private_browsing_context_exited.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_last_private_browsing_context_exited.js
index 1fd28d4ca6..4874e61bd4 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_last_private_browsing_context_exited.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_last_private_browsing_context_exited.js
@@ -6,7 +6,7 @@
 add_task(async function test_no_notification_when_pb_autostart() {
   let observedLastPBContext = false;
   let observerExited = {
-    observe(aSubject, aTopic, aData) {
+    observe() {
       observedLastPBContext = true;
     },
   };
@@ -31,7 +31,7 @@ add_task(async function test_no_notification_when_pb_autostart() {
 add_task(async function test_notification_when_about_preferences() {
   let observedLastPBContext = false;
   let observerExited = {
-    observe(aSubject, aTopic, aData) {
+    observe() {
       observedLastPBContext = true;
     },
   };
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_lastpbcontextexited.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_lastpbcontextexited.js
index c46417933a..c57a482752 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_lastpbcontextexited.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_lastpbcontextexited.js
@@ -11,7 +11,7 @@ function test() {
       let expectedExiting = true;
       let expectedExited = false;
       let observerExiting = {
-        observe(aSubject, aTopic, aData) {
+        observe(aSubject, aTopic) {
           is(
             aTopic,
             "last-pb-context-exiting",
@@ -26,7 +26,7 @@ function test() {
         },
       };
       let observerExited = {
-        observe(aSubject, aTopic, aData) {
+        observe(aSubject, aTopic) {
           is(
             aTopic,
             "last-pb-context-exited",
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_ui.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_ui.js
index ab74caeb5e..70f6666589 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_ui.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_ui.js
@@ -55,7 +55,7 @@ function test() {
   }
 
   function openPrivateBrowsingModeByUI(aWindow, aCallback) {
-    Services.obs.addObserver(function observer(aSubject, aTopic, aData) {
+    Services.obs.addObserver(function observer(aSubject) {
       aSubject.addEventListener(
         "load",
         function () {
diff --git a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoomrestore.js b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoomrestore.js
index dd0e2e1b64..ac31b925ed 100644
--- a/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoomrestore.js
+++ b/browser/components/privatebrowsing/test/browser/browser_privatebrowsing_zoomrestore.js
@@ -12,7 +12,7 @@ add_task(async function test() {
 
   function promiseLocationChange() {
     return new Promise(resolve => {
-      Services.obs.addObserver(function onLocationChange(subj, topic, data) {
+      Services.obs.addObserver(function onLocationChange(subj, topic) {
         Services.obs.removeObserver(onLocationChange, topic);
         resolve();
       }, "browser-fullZoom:location-change");
@@ -59,7 +59,7 @@ add_task(async function test() {
     );
   }
 
-  function testOnWindow(options, callback) {
+  function testOnWindow(options) {
     return BrowserTestUtils.openNewBrowserWindow(options).then(win => {
       windowsToClose.push(win);
       windowsToReset.push(win);