Merging upstream version 125.0.1.

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

5 files changed, 13 insertions, 10 deletions

diff --git a/dom/reporting/tests/browser_cleanup.js b/dom/reporting/tests/browser_cleanup.js
index e50b8db1da..06e7893fd0 100644
--- a/dom/reporting/tests/browser_cleanup.js
+++ b/dom/reporting/tests/browser_cleanup.js
@@ -57,7 +57,7 @@ add_task(async function () {
   ok(ChromeUtils.hasReportingHeaderForOrigin(TEST_DOMAIN), "We have data");
 
   await new Promise(resolve => {
-    Services.clearData.deleteData(Ci.nsIClearDataService.CLEAR_ALL, value =>
+    Services.clearData.deleteData(Ci.nsIClearDataService.CLEAR_ALL, () =>
       resolve()
     );
   });
@@ -89,7 +89,7 @@ add_task(async function () {
   ok(ChromeUtils.hasReportingHeaderForOrigin(TEST_DOMAIN), "We have data");
 
   await new Promise(resolve => {
-    Services.clearData.deleteData(Ci.nsIClearDataService.CLEAR_REPORTS, value =>
+    Services.clearData.deleteData(Ci.nsIClearDataService.CLEAR_REPORTS, () =>
       resolve()
     );
   });
@@ -125,7 +125,7 @@ add_task(async function () {
       TEST_HOST,
       true,
       Ci.nsIClearDataService.CLEAR_REPORTS,
-      value => resolve()
+      () => resolve()
     );
   });
 
@@ -269,7 +269,7 @@ add_task(async function () {
 add_task(async function () {
   info("Cleaning up.");
   await new Promise(resolve => {
-    Services.clearData.deleteData(Ci.nsIClearDataService.CLEAR_ALL, value =>
+    Services.clearData.deleteData(Ci.nsIClearDataService.CLEAR_ALL, () =>
       resolve()
     );
   });
diff --git a/dom/reporting/tests/common_deprecated.js b/dom/reporting/tests/common_deprecated.js
index 8f8415fcf3..f3ff1028be 100644
--- a/dom/reporting/tests/common_deprecated.js
+++ b/dom/reporting/tests/common_deprecated.js
@@ -1,5 +1,7 @@
 let testingInterface;
 
+/* eslint-disable mozilla/no-comparison-or-assignment-inside-ok */
+
 // eslint-disable-next-line no-unused-vars
 function test_deprecatedInterface() {
   info("Testing DeprecatedTestingInterface report");
@@ -34,7 +36,7 @@ function test_deprecatedInterface() {
           .replace("worker_deprecated.js", "common_deprecated.js"),
         "We have a sourceFile"
       );
-      is(report.body.lineNumber, 48, "We have a lineNumber");
+      is(report.body.lineNumber, 50, "We have a lineNumber");
       is(report.body.columnNumber, 24, "We have a columnNumber");
 
       obs.disconnect();
@@ -86,7 +88,7 @@ function test_deprecatedMethod() {
           .replace("worker_deprecated.js", "common_deprecated.js"),
         "We have a sourceFile"
       );
-      is(report.body.lineNumber, 100, "We have a lineNumber");
+      is(report.body.lineNumber, 102, "We have a lineNumber");
       is(report.body.columnNumber, 22, "We have a columnNumber");
 
       obs.disconnect();
@@ -122,7 +124,7 @@ function test_deprecatedMethodWithDataURI() {
     };
   </script>`;
 
-  return new Promise((resolve, reject) => {
+  return new Promise(resolve => {
     window.open(uri);
     window.addEventListener("message", e => {
       is(e.data, "passed", "The data URI is truncated");
@@ -167,7 +169,7 @@ function test_deprecatedAttribute() {
           .replace("worker_deprecated.js", "common_deprecated.js"),
         "We have a sourceFile"
       );
-      is(report.body.lineNumber, 181, "We have a lineNumber");
+      is(report.body.lineNumber, 183, "We have a lineNumber");
       is(report.body.columnNumber, 8, "We have a columnNumber");
 
       obs.disconnect();
diff --git a/dom/reporting/tests/iframe_delivering.html b/dom/reporting/tests/iframe_delivering.html
index e8c5e9e3a4..0eafd3ca8a 100644
--- a/dom/reporting/tests/iframe_delivering.html
+++ b/dom/reporting/tests/iframe_delivering.html
@@ -78,7 +78,7 @@ fetch("delivering.sjs?task=header")
 .then(_ => {
   return new Promise(resolve => {
     let w = new Worker("worker_delivering.js");
-    w.onmessage = e => resolve();
+    w.onmessage = () => resolve();
   });
 })
 .then(_ => {
diff --git a/dom/reporting/tests/worker_delivering.js b/dom/reporting/tests/worker_delivering.js
index 539bcd231c..708a7c0e28 100644
--- a/dom/reporting/tests/worker_delivering.js
+++ b/dom/reporting/tests/worker_delivering.js
@@ -1,5 +1,5 @@
 fetch("delivering.sjs?task=header&worker=true")
   .then(r => r.text())
-  .then(text => {
+  .then(() => {
     postMessage("All good!");
   });
diff --git a/dom/reporting/tests/worker_deprecated.js b/dom/reporting/tests/worker_deprecated.js
index f6b57896f6..934efaa57a 100644
--- a/dom/reporting/tests/worker_deprecated.js
+++ b/dom/reporting/tests/worker_deprecated.js
@@ -1,4 +1,5 @@
 /* eslint-disable no-undef */
+/* eslint-disable mozilla/no-comparison-or-assignment-inside-ok */
 
 // eslint-disable-next-line no-unused-vars
 function ok(a, msg) {