Merging upstream version 125.0.1.

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

2 files changed, 8 insertions, 6 deletions

diff --git a/devtools/server/actors/addon/addons.js b/devtools/server/actors/addon/addons.js
index 95a3738d61..9d37df93e4 100644
--- a/devtools/server/actors/addon/addons.js
+++ b/devtools/server/actors/addon/addons.js
@@ -11,10 +11,11 @@ const {
 
 const { AddonManager } = ChromeUtils.importESModule(
   "resource://gre/modules/AddonManager.sys.mjs",
-  { loadInDevToolsLoader: false }
+  { global: "shared" }
 );
 const { FileUtils } = ChromeUtils.importESModule(
-  "resource://gre/modules/FileUtils.sys.mjs"
+  "resource://gre/modules/FileUtils.sys.mjs",
+  { global: "contextual" }
 );
 
 // This actor is used by DevTools as well as external tools such as webext-run
@@ -43,12 +44,13 @@ class AddonsActor extends Actor {
     // so for now, there is no chance of calling this on Android.
     if (openDevTools) {
       // This module is typically loaded in the loader spawn by DevToolsStartup,
-      // in a distinct compartment thanks to useDistinctSystemPrincipalLoader and loadInDevToolsLoader flag.
+      // in a distinct compartment thanks to useDistinctSystemPrincipalLoader
+      // and global flag.
       // But here we want to reuse the shared module loader.
       // We do not want to load devtools.js in the server's distinct module loader.
       const loader = ChromeUtils.importESModule(
         "resource://devtools/shared/loader/Loader.sys.mjs",
-        { loadInDevToolsLoader: false }
+        { global: "shared" }
       );
       const {
         gDevTools,
diff --git a/devtools/server/actors/addon/webextension-inspected-window.js b/devtools/server/actors/addon/webextension-inspected-window.js
index e69a206c9d..041045eec0 100644
--- a/devtools/server/actors/addon/webextension-inspected-window.js
+++ b/devtools/server/actors/addon/webextension-inspected-window.js
@@ -218,7 +218,7 @@ class CustomizedReload {
     return this.waitForReloadCompleted;
   }
 
-  observe(subject, topic, data) {
+  observe(subject, topic) {
     if (topic !== "initial-document-element-inserted") {
       return;
     }
@@ -319,7 +319,7 @@ class WebExtensionInspectedWindowActor extends Actor {
     this.targetActor = targetActor;
   }
 
-  destroy(conn) {
+  destroy() {
     super.destroy();
 
     if (this.customizedReload) {