Merging upstream version 126.0.

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

7 files changed, 7 insertions, 7 deletions

diff --git a/toolkit/crashreporter/test/nsTestCrasher.cpp b/toolkit/crashreporter/test/nsTestCrasher.cpp
index 2148a60088..42b6a68b87 100644
--- a/toolkit/crashreporter/test/nsTestCrasher.cpp
+++ b/toolkit/crashreporter/test/nsTestCrasher.cpp
@@ -80,7 +80,7 @@ uint64_t x64CrashCFITest_EOF(uint64_t returnpfn, void*);
 #endif  // XP_WIN && HAVE_64BIT_BUILD && !defined(__MINGW32__)
 }
 
-// Keep these in sync with CrashTestUtils.jsm!
+// Keep these in sync with CrashTestUtils.sys.mjs!
 const int16_t CRASH_INVALID_POINTER_DEREF = 0;
 const int16_t CRASH_PURE_VIRTUAL_CALL = 1;
 const int16_t CRASH_OOM = 3;
diff --git a/toolkit/crashreporter/test/unit/head_win64cfi.js b/toolkit/crashreporter/test/unit/head_win64cfi.js
index 4df99213db..2daa64aecc 100644
--- a/toolkit/crashreporter/test/unit/head_win64cfi.js
+++ b/toolkit/crashreporter/test/unit/head_win64cfi.js
@@ -184,7 +184,7 @@ function assertStack(stack, expected) {
 
 // Performs a crash, runs minidump-analyzer, and checks expected stack analysis.
 //
-// how: The crash to perform. Constants defined in both CrashTestUtils.jsm
+// how: The crash to perform. Constants defined in both CrashTestUtils.sys.mjs
 //   and nsTestCrasher.cpp (i.e. CRASH_X64CFI_PUSH_NONVOL)
 // expectedStack: An array of {"symbol", "trust"} where trust is "cfi",
 //   "context", "scan", et al. May be null if you don't need to check the stack.
diff --git a/toolkit/crashreporter/test/unit/test_crash_stack_overflow.js b/toolkit/crashreporter/test/unit/test_crash_stack_overflow.js
index a47c217238..7c1d3821ec 100644
--- a/toolkit/crashreporter/test/unit/test_crash_stack_overflow.js
+++ b/toolkit/crashreporter/test/unit/test_crash_stack_overflow.js
@@ -12,7 +12,7 @@ add_task(async function run_test() {
       crashType = CrashTestUtils.CRASH_STACK_OVERFLOW;
       crashReporter.annotateCrashReport("TestKey", "TestValue");
     },
-    async function (mdump, extra, extraFile) {
+    async function (mdump, extra) {
       Assert.equal(extra.TestKey, "TestValue");
     },
     // process will exit with a zero exit status
diff --git a/toolkit/crashreporter/test/unit/test_crashreporter_appmem.js b/toolkit/crashreporter/test/unit/test_crashreporter_appmem.js
index f42fe10f0c..dcf5bd3153 100644
--- a/toolkit/crashreporter/test/unit/test_crashreporter_appmem.js
+++ b/toolkit/crashreporter/test/unit/test_crashreporter_appmem.js
@@ -4,7 +4,7 @@ add_task(async function run_test() {
       let appAddr = CrashTestUtils.saveAppMemory();
       crashReporter.registerAppMemory(appAddr, 32);
     },
-    function (mdump, extra) {
+    function (mdump) {
       Assert.ok(mdump.exists());
       Assert.ok(mdump.fileSize > 0);
       Assert.ok(CrashTestUtils.dumpCheckMemory(mdump.path));
diff --git a/toolkit/crashreporter/test/unit/test_event_files.js b/toolkit/crashreporter/test/unit/test_event_files.js
index 844d7700ff..f4054089ea 100644
--- a/toolkit/crashreporter/test/unit/test_event_files.js
+++ b/toolkit/crashreporter/test/unit/test_event_files.js
@@ -24,7 +24,7 @@ add_task(async function test_main_process_crash() {
         crashType = CrashTestUtils.CRASH_MOZ_CRASH;
         crashReporter.annotateCrashReport("ShutdownProgress", "event-test");
       },
-      (minidump, extra) => {
+      minidump => {
         basename = minidump.leafName;
         Object.defineProperty(cm, "_eventsDirs", { value: [getEventDir()] });
         cm.aggregateEventsFiles().then(resolve, reject);
diff --git a/toolkit/crashreporter/test/unit/test_override_exception_handler.js b/toolkit/crashreporter/test/unit/test_override_exception_handler.js
index 1b4dec8a61..caabc12de8 100644
--- a/toolkit/crashreporter/test/unit/test_override_exception_handler.js
+++ b/toolkit/crashreporter/test/unit/test_override_exception_handler.js
@@ -5,7 +5,7 @@ add_task(async function run_test() {
     function () {
       CrashTestUtils.TryOverrideExceptionHandler();
     },
-    function (mdump, extra) {},
+    function () {},
     true
   );
 });
diff --git a/toolkit/crashreporter/test/unit_ipc/test_content_memory_list.js b/toolkit/crashreporter/test/unit_ipc/test_content_memory_list.js
index 733d224160..b3770c7bcc 100644
--- a/toolkit/crashreporter/test/unit_ipc/test_content_memory_list.js
+++ b/toolkit/crashreporter/test/unit_ipc/test_content_memory_list.js
@@ -18,7 +18,7 @@ add_task(async function run_test() {
     is_win7_or_newer = true;
   }
 
-  await do_content_crash(null, function (mdump, extra) {
+  await do_content_crash(null, function (mdump) {
     Assert.ok(mdump.exists());
     Assert.ok(mdump.fileSize > 0);
     if (is_win7_or_newer) {