Merging upstream version 125.0.1.

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

3 files changed, 14 insertions, 8 deletions

diff --git a/devtools/server/actors/descriptors/tab.js b/devtools/server/actors/descriptors/tab.js
index ea20d3fb36..f5980126cb 100644
--- a/devtools/server/actors/descriptors/tab.js
+++ b/devtools/server/actors/descriptors/tab.js
@@ -21,12 +21,17 @@ const {
   connectToFrame,
 } = require("resource://devtools/server/connectors/frame-connector.js");
 const lazy = {};
-ChromeUtils.defineESModuleGetters(lazy, {
-  PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
-});
+ChromeUtils.defineESModuleGetters(
+  lazy,
+  {
+    PlacesUtils: "resource://gre/modules/PlacesUtils.sys.mjs",
+  },
+  { global: "contextual" }
+);
 
 const { AppConstants } = ChromeUtils.importESModule(
-  "resource://gre/modules/AppConstants.sys.mjs"
+  "resource://gre/modules/AppConstants.sys.mjs",
+  { global: "contextual" }
 );
 const {
   createBrowserElementSessionContext,
diff --git a/devtools/server/actors/descriptors/webextension.js b/devtools/server/actors/descriptors/webextension.js
index 56e4abfc41..b202036aef 100644
--- a/devtools/server/actors/descriptors/webextension.js
+++ b/devtools/server/actors/descriptors/webextension.js
@@ -28,13 +28,13 @@ const lazy = {};
 loader.lazyGetter(lazy, "AddonManager", () => {
   return ChromeUtils.importESModule(
     "resource://gre/modules/AddonManager.sys.mjs",
-    { loadInDevToolsLoader: false }
+    { global: "shared" }
   ).AddonManager;
 });
 loader.lazyGetter(lazy, "ExtensionParent", () => {
   return ChromeUtils.importESModule(
     "resource://gre/modules/ExtensionParent.sys.mjs",
-    { loadInDevToolsLoader: false }
+    { global: "shared" }
   ).ExtensionParent;
 });
 loader.lazyRequireGetter(
@@ -202,7 +202,7 @@ class WebExtensionDescriptorActor extends Actor {
    *
    * bypassCache has no impact for addon reloads.
    */
-  reloadDescriptor({ bypassCache }) {
+  reloadDescriptor() {
     return this.reload();
   }
 
diff --git a/devtools/server/actors/descriptors/worker.js b/devtools/server/actors/descriptors/worker.js
index 89ca918e05..4c8689fac8 100644
--- a/devtools/server/actors/descriptors/worker.js
+++ b/devtools/server/actors/descriptors/worker.js
@@ -23,7 +23,8 @@ const {
   DevToolsServer,
 } = require("resource://devtools/server/devtools-server.js");
 const { XPCOMUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/XPCOMUtils.sys.mjs"
+  "resource://gre/modules/XPCOMUtils.sys.mjs",
+  { global: "contextual" }
 );
 const {
   createWorkerSessionContext,