3 files changed, 15 insertions, 10 deletions
diff --git a/devtools/server/actors/resources/utils/content-process-storage.js b/devtools/server/actors/resources/utils/content-process-storage.js
index 7e126ce3f7..80d7e319a8 100644
--- a/devtools/server/actors/resources/utils/content-process-storage.js
+++ b/devtools/server/actors/resources/utils/content-process-storage.js
@@ -7,10 +7,14 @@
 const EventEmitter = require("resource://devtools/shared/event-emitter.js");
 
 const lazy = {};
-ChromeUtils.defineESModuleGetters(lazy, {
-  getAddonIdForWindowGlobal:
-    "resource://devtools/server/actors/watcher/browsing-context-helpers.sys.mjs",
-});
+ChromeUtils.defineESModuleGetters(
+  lazy,
+  {
+    getAddonIdForWindowGlobal:
+      "resource://devtools/server/actors/watcher/browsing-context-helpers.sys.mjs",
+  },
+  { global: "contextual" }
+);
 
 // ms of delay to throttle updates
 const BATCH_DELAY = 200;
diff --git a/devtools/server/actors/resources/utils/nsi-console-listener-watcher.js b/devtools/server/actors/resources/utils/nsi-console-listener-watcher.js
index 8d1ed43612..d4bde43818 100644
--- a/devtools/server/actors/resources/utils/nsi-console-listener-watcher.js
+++ b/devtools/server/actors/resources/utils/nsi-console-listener-watcher.js
@@ -79,7 +79,7 @@ class nsIConsoleListenerWatcher {
    * @param {TargetActor} targetActor
    * @return {Boolean}
    */
-  shouldHandleTarget(targetActor) {
+  shouldHandleTarget() {
     return true;
   }
 
@@ -91,7 +91,7 @@ class nsIConsoleListenerWatcher {
    * @param {nsIScriptError|nsIConsoleMessage} message
    * @return {Boolean}
    */
-  shouldHandleMessage(targetActor, message) {
+  shouldHandleMessage() {
     throw new Error(
       "'shouldHandleMessage' should be implemented in the class that extends nsIConsoleListenerWatcher"
     );
@@ -101,12 +101,12 @@ class nsIConsoleListenerWatcher {
    * Prepare the resource to be sent to the client. This should be implemented on the
    * child class.
    *
-   * @param targetActor
-   * @param nsIScriptError|nsIConsoleMessage message
+   * @param _targetActor
+   * @param nsIScriptError|nsIConsoleMessage _message
    * @return object
    *         The object you can send to the remote client.
    */
-  buildResource(targetActor, message) {
+  buildResource(_targetActor, _message) {
     throw new Error(
       "'buildResource' should be implemented in the class that extends nsIConsoleListenerWatcher"
     );
diff --git a/devtools/server/actors/resources/utils/parent-process-storage.js b/devtools/server/actors/resources/utils/parent-process-storage.js
index 423d13b6b5..760e6e4d38 100644
--- a/devtools/server/actors/resources/utils/parent-process-storage.js
+++ b/devtools/server/actors/resources/utils/parent-process-storage.js
@@ -6,7 +6,8 @@
 
 const EventEmitter = require("resource://devtools/shared/event-emitter.js");
 const { isWindowGlobalPartOfContext } = ChromeUtils.importESModule(
-  "resource://devtools/server/actors/watcher/browsing-context-helpers.sys.mjs"
+  "resource://devtools/server/actors/watcher/browsing-context-helpers.sys.mjs",
+  { global: "contextual" }
 );
 
 // ms of delay to throttle updates