Merging upstream version 125.0.1.

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

5 files changed, 7 insertions, 11 deletions

diff --git a/dom/notification/test/chrome/test_notification_system_principal.xhtml b/dom/notification/test/chrome/test_notification_system_principal.xhtml
index 0700d59338..c563a817a8 100644
--- a/dom/notification/test/chrome/test_notification_system_principal.xhtml
+++ b/dom/notification/test/chrome/test_notification_system_principal.xhtml
@@ -23,14 +23,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=874090
   const ALERTS_SERVICE_CONTRACT_ID = "@mozilla.org/alerts-service;1";
 
   var mockAlertsService = {
-    showAlert(alert, alertListener) {
+    showAlert() {
       ok(true, "System principal was granted permission and is able to call showAlert.");
       unregisterMock();
       SimpleTest.finish();
     },
 
-    showAlertNotification(imageUrl, title, text, textClickable,
-                          cookie, alertListener, name, dir, lang, data) {
+    showAlertNotification() {
       this.showAlert();
     },
 
diff --git a/dom/notification/test/mochitest/NotificationTest.js b/dom/notification/test/mochitest/NotificationTest.js
index 400ff56253..8593125389 100644
--- a/dom/notification/test/mochitest/NotificationTest.js
+++ b/dom/notification/test/mochitest/NotificationTest.js
@@ -75,7 +75,7 @@ var NotificationTest = (function () {
       );
     },
 
-    clickNotification(notification) {
+    clickNotification() {
       // TODO: how??
     },
 
diff --git a/dom/notification/test/mochitest/test_notification_basics.html b/dom/notification/test/mochitest/test_notification_basics.html
index 3dde839a96..ba2bd09174 100644
--- a/dom/notification/test/mochitest/test_notification_basics.html
+++ b/dom/notification/test/mochitest/test_notification_basics.html
@@ -68,7 +68,7 @@
       Notification.requestPermission({})
         .then(_ => {
           ok(false, "Non callable arg to requestPermission should reject promise");
-        }, err => {
+        }, () => {
           ok(true, "Non callable arg to requestPermission should reject promise");
         })
         .then(done);
diff --git a/dom/notification/test/mochitest/test_notification_tag.html b/dom/notification/test/mochitest/test_notification_tag.html
index f4fc72bbe3..d2bc15418e 100644
--- a/dom/notification/test/mochitest/test_notification_tag.html
+++ b/dom/notification/test/mochitest/test_notification_tag.html
@@ -32,7 +32,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=782211
     var notificationsCreated = [];
 
     const mockAlertsService = {
-      showAlert(alert, alertListener) {
+      showAlert(alert) {
         notificationsCreated.push(alert.name);
         if (notificationsCreated.length == 3) {
           // notifications created by the test1 origin
@@ -78,10 +78,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=782211
         textClickable,
         cookie,
         alertListener,
-        name,
-        dir,
-        lang,
-        data
+        name
       ) {
         this.showAlert({ name });
       },
diff --git a/dom/notification/test/unit/test_notificationdb.js b/dom/notification/test/unit/test_notificationdb.js
index 33397f87f3..b6ca8bd79c 100644
--- a/dom/notification/test/unit/test_notificationdb.js
+++ b/dom/notification/test/unit/test_notificationdb.js
@@ -112,7 +112,7 @@ add_test(function test_send_two_get_one() {
   };
 
   let msgSaveReply = "Notification:Save:Return:OK";
-  let msgSaveHandler = function (message) {
+  let msgSaveHandler = function () {
     calls += 1;
     if (calls === 2) {
       addAndSend("Notification:GetAll", msgGetReply, msgGetHandler, {