Merging upstream version 125.0.1.

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

1 files changed, 24 insertions, 19 deletions

diff --git a/devtools/shared/network-observer/NetworkObserver.sys.mjs b/devtools/shared/network-observer/NetworkObserver.sys.mjs
index 35e66c9d5b..8375fb4714 100644
--- a/devtools/shared/network-observer/NetworkObserver.sys.mjs
+++ b/devtools/shared/network-observer/NetworkObserver.sys.mjs
@@ -10,7 +10,7 @@
 // Enable logging all platform events this module listen to
 const DEBUG_PLATFORM_EVENTS = false;
 // Enables defining criteria to filter the logs
-const DEBUG_PLATFORM_EVENTS_FILTER = (eventName, channel) => {
+const DEBUG_PLATFORM_EVENTS_FILTER = () => {
   // e.g return eventName == "HTTP_TRANSACTION:REQUEST_HEADER" && channel.URI.spec == "http://foo.com";
   return true;
 };
@@ -19,23 +19,28 @@ const lazy = {};
 
 import { DevToolsInfaillibleUtils } from "resource://devtools/shared/DevToolsInfaillibleUtils.sys.mjs";
 
-ChromeUtils.defineESModuleGetters(lazy, {
-  ChannelMap: "resource://devtools/shared/network-observer/ChannelMap.sys.mjs",
-  NetworkAuthListener:
-    "resource://devtools/shared/network-observer/NetworkAuthListener.sys.mjs",
-  NetworkHelper:
-    "resource://devtools/shared/network-observer/NetworkHelper.sys.mjs",
-  NetworkOverride:
-    "resource://devtools/shared/network-observer/NetworkOverride.sys.mjs",
-  NetworkResponseListener:
-    "resource://devtools/shared/network-observer/NetworkResponseListener.sys.mjs",
-  NetworkThrottleManager:
-    "resource://devtools/shared/network-observer/NetworkThrottleManager.sys.mjs",
-  NetworkUtils:
-    "resource://devtools/shared/network-observer/NetworkUtils.sys.mjs",
-  wildcardToRegExp:
-    "resource://devtools/shared/network-observer/WildcardToRegexp.sys.mjs",
-});
+ChromeUtils.defineESModuleGetters(
+  lazy,
+  {
+    ChannelMap:
+      "resource://devtools/shared/network-observer/ChannelMap.sys.mjs",
+    NetworkAuthListener:
+      "resource://devtools/shared/network-observer/NetworkAuthListener.sys.mjs",
+    NetworkHelper:
+      "resource://devtools/shared/network-observer/NetworkHelper.sys.mjs",
+    NetworkOverride:
+      "resource://devtools/shared/network-observer/NetworkOverride.sys.mjs",
+    NetworkResponseListener:
+      "resource://devtools/shared/network-observer/NetworkResponseListener.sys.mjs",
+    NetworkThrottleManager:
+      "resource://devtools/shared/network-observer/NetworkThrottleManager.sys.mjs",
+    NetworkUtils:
+      "resource://devtools/shared/network-observer/NetworkUtils.sys.mjs",
+    wildcardToRegExp:
+      "resource://devtools/shared/network-observer/WildcardToRegexp.sys.mjs",
+  },
+  { global: "contextual" }
+);
 
 const gActivityDistributor = Cc[
   "@mozilla.org/network/http-activity-distributor;1"
@@ -267,7 +272,7 @@ export class NetworkObserver {
   }
 
   #serviceWorkerRequest = DevToolsInfaillibleUtils.makeInfallible(
-    (subject, topic, data) => {
+    (subject, topic) => {
       const channel = subject.QueryInterface(Ci.nsIHttpChannel);
 
       if (this.#ignoreChannelFunction(channel)) {