Merging upstream version 126.0.

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

3 files changed, 6 insertions, 6 deletions

diff --git a/xpcom/tests/unit/test_bug325418.js b/xpcom/tests/unit/test_bug325418.js
index 5840aacf74..c86f8d5845 100644
--- a/xpcom/tests/unit/test_bug325418.js
+++ b/xpcom/tests/unit/test_bug325418.js
@@ -8,7 +8,7 @@ var gStartTime2;
 var timer;
 
 var observer1 = {
-  observe: function observeTC1(subject, topic, data) {
+  observe: function observeTC1(subject, topic) {
     if (topic == "timer-callback") {
       // Stop timer, so it doesn't repeat (if test runs slowly).
       timer.cancel();
@@ -30,7 +30,7 @@ var observer1 = {
 };
 
 var observer2 = {
-  observe: function observeTC2(subject, topic, data) {
+  observe: function observeTC2(subject, topic) {
     if (topic == "timer-callback") {
       // Stop timer, so it doesn't repeat (if test runs slowly).
       timer.cancel();
diff --git a/xpcom/tests/unit/test_nsIProcess.js b/xpcom/tests/unit/test_nsIProcess.js
index 582d10440c..e8a382b29f 100644
--- a/xpcom/tests/unit/test_nsIProcess.js
+++ b/xpcom/tests/unit/test_nsIProcess.js
@@ -128,7 +128,7 @@ function test_notify_blocking() {
   process.init(file);
 
   process.runAsync([], 0, {
-    observe(subject, topic, data) {
+    observe(subject, topic) {
       process = subject.QueryInterface(Ci.nsIProcess);
       Assert.equal(topic, "process-failed");
       Assert.equal(process.exitValue, 42);
@@ -145,7 +145,7 @@ function test_notify_nonblocking() {
   process.init(file);
 
   process.runAsync(TEST_ARGS, TEST_ARGS.length, {
-    observe(subject, topic, data) {
+    observe(subject, topic) {
       process = subject.QueryInterface(Ci.nsIProcess);
       Assert.equal(topic, "process-finished");
       Assert.equal(process.exitValue, 0);
@@ -162,7 +162,7 @@ function test_notify_killed() {
   process.init(file);
 
   process.runAsync([], 0, {
-    observe(subject, topic, data) {
+    observe(subject, topic) {
       process = subject.QueryInterface(Ci.nsIProcess);
       Assert.equal(topic, "process-failed");
       do_test_finished();
diff --git a/xpcom/tests/unit/test_windows_registry.js b/xpcom/tests/unit/test_windows_registry.js
index 691c0461c3..ef5082a666 100644
--- a/xpcom/tests/unit/test_windows_registry.js
+++ b/xpcom/tests/unit/test_windows_registry.js
@@ -172,7 +172,7 @@ function test_childkey_functions(testKey) {
   strictEqual(testKey.hasChild(TESTDATA_CHILD_KEY), false);
 }
 
-function cleanup_test_run(testKey, keyName) {
+function cleanup_test_run(testKey) {
   info("Cleaning up test.");
 
   for (var i = 0; i < testKey.childCount; i++) {