Merging upstream version 126.0.

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

14 files changed, 21 insertions, 21 deletions

diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.sys.mjs
index a2fe6195ab..d7e24ad9a5 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.sys.mjs
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/Screenshot.sys.mjs
@@ -95,7 +95,7 @@ export var Screenshot = {
   },
 
   async _screenshotOSX(filename) {
-    let screencapture = (windowID = null) => {
+    let screencapture = () => {
       return new Promise((resolve, reject) => {
         // Get the screencapture executable
         let file = Cc["@mozilla.org/file/local;1"].createInstance(Ci.nsIFile);
@@ -175,7 +175,7 @@ export var Screenshot = {
 
   _processObserver(resolve, reject) {
     return {
-      observe(subject, topic, data) {
+      observe(subject, topic) {
         switch (topic) {
           case "process-finished":
             try {
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.sys.mjs
index 8309eab623..c044b557c6 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.sys.mjs
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/AppMenu.sys.mjs
@@ -5,7 +5,7 @@
 import { BrowserTestUtils } from "resource://testing-common/BrowserTestUtils.sys.mjs";
 
 export var AppMenu = {
-  init(libDir) {},
+  init() {},
 
   configurations: {
     appMenuMainView: {
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.sys.mjs
index 2bc12d9012..9a8bea5327 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.sys.mjs
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Buttons.sys.mjs
@@ -5,7 +5,7 @@
 import { CustomizableUI } from "resource:///modules/CustomizableUI.sys.mjs";
 
 export var Buttons = {
-  init(libDir) {
+  init() {
     createWidget();
   },
 
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.sys.mjs
index 587b573ed3..391f52765b 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.sys.mjs
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.sys.mjs
@@ -26,7 +26,7 @@ const MIXED_PASSIVE_CONTENT_URL = `https://example.com/${RESOURCE_PATH}/mixed_pa
 const TRACKING_PAGE = `http://tracking.example.org/${RESOURCE_PATH}/tracking.html`;
 
 export var ControlCenter = {
-  init(libDir) {},
+  init() {},
 
   configurations: {
     about: {
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.sys.mjs
index a5a1b65b69..e7b319fdd6 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.sys.mjs
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/CustomizeMode.sys.mjs
@@ -5,7 +5,7 @@
 import { setTimeout } from "resource://gre/modules/Timer.sys.mjs";
 
 export var CustomizeMode = {
-  init(libDir) {},
+  init() {},
 
   configurations: {
     notCustomizing: {
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.sys.mjs
index addef011c0..d07b9be0e5 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.sys.mjs
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.sys.mjs
@@ -19,7 +19,7 @@ function selectToolbox(toolbox) {
 }
 
 export var DevTools = {
-  init(libDir) {
+  init() {
     let panels = [
       "options",
       "webconsole",
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.sys.mjs
index 91c3349ec7..c58a60c5c2 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.sys.mjs
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/LightweightThemes.sys.mjs
@@ -5,7 +5,7 @@
 import { AddonManager } from "resource://gre/modules/AddonManager.sys.mjs";
 
 export var LightweightThemes = {
-  init(libDir) {},
+  init() {},
 
   configurations: {
     noLWT: {
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.sys.mjs
index de12c69e81..b49f1be949 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.sys.mjs
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.sys.mjs
@@ -12,7 +12,7 @@ const URL =
 let lastTab = null;
 
 export var PermissionPrompts = {
-  init(libDir) {
+  init() {
     Services.prefs.setBoolPref("media.navigator.permission.fake", true);
     Services.prefs.setBoolPref("extensions.install.requireBuiltInCerts", false);
     Services.prefs.setBoolPref("signon.rememberSignons", true);
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.sys.mjs
index d988ba88cf..c205edee33 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.sys.mjs
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Preferences.sys.mjs
@@ -8,7 +8,7 @@
 import { TestUtils } from "resource://testing-common/TestUtils.sys.mjs";
 
 export var Preferences = {
-  init(libDir) {
+  init() {
     let panes = [
       ["paneGeneral"],
       ["paneGeneral", browsingGroup],
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.sys.mjs
index 85b134b8bc..e9f82e15b5 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.sys.mjs
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Tabs.sys.mjs
@@ -10,7 +10,7 @@ import { setTimeout } from "resource://gre/modules/Timer.sys.mjs";
 import { TestUtils } from "resource://testing-common/TestUtils.sys.mjs";
 
 export var Tabs = {
-  init(libDir) {},
+  init() {},
 
   configurations: {
     fiveTabs: {
@@ -20,7 +20,7 @@ export var Tabs = {
         let browserWindow =
           Services.wm.getMostRecentWindow("navigator:browser");
         hoverTab(browserWindow.gBrowser.tabs[3]);
-        await new Promise((resolve, reject) => {
+        await new Promise(resolve => {
           setTimeout(resolve, 3000);
         });
         await allTabTitlesDisplayed(browserWindow);
@@ -59,7 +59,7 @@ export var Tabs = {
         let newTabButton = browserWindow.gBrowser.tabContainer.newTabButton;
         hoverTab(newTabButton);
 
-        await new Promise((resolve, reject) => {
+        await new Promise(resolve => {
           setTimeout(resolve, 3000);
         });
         await allTabTitlesDisplayed(browserWindow);
@@ -117,7 +117,7 @@ export var Tabs = {
         browserWindow.gBrowser.selectTabAtIndex(3);
         hoverTab(browserWindow.gBrowser.tabs[5]);
 
-        await new Promise((resolve, reject) => {
+        await new Promise(resolve => {
           setTimeout(resolve, 3000);
         });
 
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.sys.mjs
index bc5b12c219..3c2973aa0a 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.sys.mjs
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/TabsInTitlebar.sys.mjs
@@ -5,7 +5,7 @@
 const PREF_TABS_IN_TITLEBAR = "browser.tabs.inTitlebar";
 
 export var TabsInTitlebar = {
-  init(libDir) {},
+  init() {},
 
   configurations: {
     tabsInTitlebar: {
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.sys.mjs
index 06b1159a5e..86a0064437 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.sys.mjs
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/Toolbars.sys.mjs
@@ -3,7 +3,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 export var Toolbars = {
-  init(libDir) {},
+  init() {},
 
   configurations: {
     onlyNavBar: {
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/UIDensities.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/UIDensities.sys.mjs
index 37cc123727..9fa7cf32bf 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/UIDensities.sys.mjs
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/UIDensities.sys.mjs
@@ -3,7 +3,7 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 export var UIDensities = {
-  init(libDir) {},
+  init() {},
 
   configurations: {
     compactDensity: {
diff --git a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.sys.mjs b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.sys.mjs
index 98a4e3ec00..8a1694f731 100644
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.sys.mjs
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/WindowSize.sys.mjs
@@ -6,7 +6,7 @@ import { setTimeout } from "resource://gre/modules/Timer.sys.mjs";
 import { BrowserTestUtils } from "resource://testing-common/BrowserTestUtils.sys.mjs";
 
 export var WindowSize = {
-  init(libDir) {
+  init() {
     Services.prefs.setBoolPref("browser.fullscreen.autohide", false);
   },
 
@@ -20,7 +20,7 @@ export var WindowSize = {
 
         // Wait for the Lion fullscreen transition to end as there doesn't seem to be an event
         // and trying to maximize while still leaving fullscreen doesn't work.
-        await new Promise((resolve, reject) => {
+        await new Promise(resolve => {
           setTimeout(function waitToLeaveFS() {
             browserWindow.maximize();
             resolve();
@@ -36,7 +36,7 @@ export var WindowSize = {
           Services.wm.getMostRecentWindow("navigator:browser");
         await toggleFullScreen(browserWindow, false);
         browserWindow.restore();
-        await new Promise((resolve, reject) => {
+        await new Promise(resolve => {
           setTimeout(resolve, 5000);
         });
       },
@@ -49,7 +49,7 @@ export var WindowSize = {
           Services.wm.getMostRecentWindow("navigator:browser");
         await toggleFullScreen(browserWindow, true);
         // OS X Lion fullscreen transition takes a while
-        await new Promise((resolve, reject) => {
+        await new Promise(resolve => {
           setTimeout(resolve, 5000);
         });
       },