Merging upstream version 125.0.1.

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

4 files changed, 11 insertions, 11 deletions

diff --git a/devtools/client/aboutdebugging/src/actions/debug-targets.js b/devtools/client/aboutdebugging/src/actions/debug-targets.js
index 9ac3bee3b5..fa768c3d22 100644
--- a/devtools/client/aboutdebugging/src/actions/debug-targets.js
+++ b/devtools/client/aboutdebugging/src/actions/debug-targets.js
@@ -7,7 +7,7 @@
 const { AddonManager } = ChromeUtils.importESModule(
   "resource://gre/modules/AddonManager.sys.mjs",
   // AddonManager is a singleton, never create two instances of it.
-  { loadInDevToolsLoader: false }
+  { global: "shared" }
 );
 const {
   remoteClientManager,
@@ -133,7 +133,7 @@ function installTemporaryExtension() {
   const message = l10n.getString(
     "about-debugging-tmp-extension-install-message"
   );
-  return async ({ dispatch, getState }) => {
+  return async ({ dispatch }) => {
     dispatch({ type: TEMPORARY_EXTENSION_INSTALL_START });
     const file = await openTemporaryExtension(window, message);
     try {
@@ -146,7 +146,7 @@ function installTemporaryExtension() {
 }
 
 function pushServiceWorker(id, registrationFront) {
-  return async ({ dispatch, getState }) => {
+  return async () => {
     try {
       // The push button is only available if canDebugServiceWorkers is true.
       // With this configuration, `push` should always be called on the
diff --git a/devtools/client/aboutdebugging/src/actions/runtimes.js b/devtools/client/aboutdebugging/src/actions/runtimes.js
index fba620951e..52148f80b2 100644
--- a/devtools/client/aboutdebugging/src/actions/runtimes.js
+++ b/devtools/client/aboutdebugging/src/actions/runtimes.js
@@ -202,7 +202,7 @@ function connectRuntime(id) {
 }
 
 function createThisFirefoxRuntime() {
-  return ({ dispatch, getState }) => {
+  return ({ dispatch }) => {
     const thisFirefoxRuntime = {
       id: RUNTIMES.THIS_FIREFOX,
       isConnecting: false,
@@ -488,7 +488,7 @@ function updateRemoteRuntimes(runtimes, type) {
  * before leaving about:debugging.
  */
 function removeRuntimeListeners() {
-  return ({ dispatch, getState }) => {
+  return ({ getState }) => {
     const allRuntimes = getAllRuntimes(getState().runtimes);
     const remoteRuntimes = allRuntimes.filter(
       r => r.type !== RUNTIMES.THIS_FIREFOX
diff --git a/devtools/client/aboutdebugging/src/actions/telemetry.js b/devtools/client/aboutdebugging/src/actions/telemetry.js
index b418c77a50..d90b5f49e1 100644
--- a/devtools/client/aboutdebugging/src/actions/telemetry.js
+++ b/devtools/client/aboutdebugging/src/actions/telemetry.js
@@ -13,7 +13,7 @@ const {
  * be processed by the event recording middleware.
  */
 function recordTelemetryEvent(method, details) {
-  return ({ dispatch, getState }) => {
+  return ({ dispatch }) => {
     dispatch({ type: TELEMETRY_RECORD, method, details });
   };
 }
diff --git a/devtools/client/aboutdebugging/src/actions/ui.js b/devtools/client/aboutdebugging/src/actions/ui.js
index fb676cefd6..f8afac8bbd 100644
--- a/devtools/client/aboutdebugging/src/actions/ui.js
+++ b/devtools/client/aboutdebugging/src/actions/ui.js
@@ -97,13 +97,13 @@ function updateDebugTargetCollapsibility(key, isCollapsed) {
 }
 
 function addNetworkLocation(location) {
-  return ({ dispatch, getState }) => {
+  return () => {
     NetworkLocationsModule.addNetworkLocation(location);
   };
 }
 
 function removeNetworkLocation(location) {
-  return ({ dispatch, getState }) => {
+  return () => {
     NetworkLocationsModule.removeNetworkLocation(location);
   };
 }
@@ -133,7 +133,7 @@ function updateAdbReady(isAdbReady) {
 }
 
 function updateNetworkLocations(locations) {
-  return async ({ dispatch, getState }) => {
+  return async ({ dispatch }) => {
     dispatch({ type: NETWORK_LOCATIONS_UPDATE_START });
     try {
       await dispatch(Actions.updateNetworkRuntimes(locations));
@@ -145,7 +145,7 @@ function updateNetworkLocations(locations) {
 }
 
 function installAdbAddon() {
-  return async ({ dispatch, getState }) => {
+  return async ({ dispatch }) => {
     dispatch({ type: ADB_ADDON_INSTALL_START });
 
     try {
@@ -160,7 +160,7 @@ function installAdbAddon() {
 }
 
 function uninstallAdbAddon() {
-  return async ({ dispatch, getState }) => {
+  return async ({ dispatch }) => {
     dispatch({ type: ADB_ADDON_UNINSTALL_START });
 
     try {