1 files changed, 25 insertions, 6 deletions
diff --git a/remote/shared/listeners/test/browser/browser_NetworkListener.js b/remote/shared/listeners/test/browser/browser_NetworkListener.js
index cc1b42f2fc..211ccef49c 100644
--- a/remote/shared/listeners/test/browser/browser_NetworkListener.js
+++ b/remote/shared/listeners/test/browser/browser_NetworkListener.js
@@ -2,6 +2,9 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+const { NavigationManager } = ChromeUtils.importESModule(
+  "chrome://remote/content/shared/NavigationManager.sys.mjs"
+);
 const { NetworkListener } = ChromeUtils.importESModule(
   "chrome://remote/content/shared/listeners/NetworkListener.sys.mjs"
 );
@@ -10,7 +13,10 @@ const { TabManager } = ChromeUtils.importESModule(
 );
 
 add_task(async function test_beforeRequestSent() {
-  const listener = new NetworkListener();
+  const navigationManager = new NavigationManager();
+  navigationManager.startMonitoring();
+
+  const listener = new NetworkListener(navigationManager);
   const events = [];
   const onEvent = (name, data) => events.push(data);
   listener.on("before-request-sent", onEvent);
@@ -54,10 +60,14 @@ add_task(async function test_beforeRequestSent() {
   gBrowser.removeTab(tab2);
   listener.off("before-request-sent", onEvent);
   listener.destroy();
+  navigationManager.destroy();
 });
 
 add_task(async function test_beforeRequestSent_newTab() {
-  const listener = new NetworkListener();
+  const navigationManager = new NavigationManager();
+  navigationManager.startMonitoring();
+
+  const listener = new NetworkListener(navigationManager);
   const onBeforeRequestSent = listener.once("before-request-sent");
   listener.startListening();
 
@@ -76,10 +86,14 @@ add_task(async function test_beforeRequestSent_newTab() {
     "https://example.com/document-builder.sjs?html=tab"
   );
   gBrowser.removeTab(tab);
+  navigationManager.destroy();
 });
 
 add_task(async function test_fetchError() {
-  const listener = new NetworkListener();
+  const navigationManager = new NavigationManager();
+  navigationManager.startMonitoring();
+
+  const listener = new NetworkListener(navigationManager);
   const onFetchError = listener.once("fetch-error");
   listener.startListening();
 
@@ -90,11 +104,16 @@ add_task(async function test_fetchError() {
   const event = await onFetchError;
 
   assertNetworkEvent(event, contextId, "https://not_a_valid_url/");
-  is(event.errorText, "NS_ERROR_UNKNOWN_HOST");
+  is(event.request.errorText, "NS_ERROR_UNKNOWN_HOST");
   gBrowser.removeTab(tab);
+  navigationManager.destroy();
 });
 
 function assertNetworkEvent(event, expectedContextId, expectedUrl) {
-  is(event.contextId, expectedContextId, "Event has the expected context id");
-  is(event.requestData.url, expectedUrl, "Event has the expected url");
+  is(
+    event.request.contextId,
+    expectedContextId,
+    "Event has the expected context id"
+  );
+  is(event.request.serializedURL, expectedUrl, "Event has the expected url");
 }