Bug 1690474 - [remote] Move CDP specific code to cdp/. r=remote-proto…

…col-reviewers,jdescottes Differential Revision: https://phabricator.services.mozilla.com/D104574
dothq · Feb 14, 2021 · 8cb9082 · 8cb9082
1 parent ec7ae63
commit 8cb9082
Show file tree

Hide file tree

Showing 59 changed files with 205 additions and 202 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -158,7 +158,7 @@ modules/libpref/test/unit/*data/
 python/
 
 # These are (mainly) imported code that we don't want to lint to make imports easier.
-remote/Protocol.jsm
+remote/cdp/Protocol.jsm
 remote/test/browser/chrome-remote-interface.js
 
 # services/ exclusions

diff --git a/remote/Connection.jsm → remote/cdp/Connection.jsm b/remote/Connection.jsm → remote/cdp/Connection.jsm
@@ -15,7 +15,7 @@ const { truncate } = ChromeUtils.import(
 );
 const { Log } = ChromeUtils.import("chrome://remote/content/shared/Log.jsm");
 const { UnknownMethodError } = ChromeUtils.import(
-  "chrome://remote/content/Error.jsm"
+  "chrome://remote/content/cdp/Error.jsm"
 );
 
 XPCOMUtils.defineLazyGetter(this, "log", Log.get);

diff --git a/remote/Error.jsm → remote/cdp/Error.jsm b/remote/Error.jsm → remote/cdp/Error.jsm
@@ -51,8 +51,8 @@ class RemoteAgentError extends Error {
    * The error must be of this form:
    *
    *     {"message": "TypeError: foo is not a function\n
-   *     execute@chrome://remote/content/sessions/Session.jsm:73:39\n
-   *     onMessage@chrome://remote/content/sessions/TabSession.jsm:65:20"}
+   *     execute@chrome://remote/content/cdp/sessions/Session.jsm:73:39\n
+   *     onMessage@chrome://remote/content/cdp/sessions/TabSession.jsm:65:20"}
    *
    * This approach has the notable deficiency that it cannot deal
    * with causes to errors because of the unstructured nature of CDP

diff --git a/remote/JSONHandler.jsm → remote/cdp/JSONHandler.jsm b/remote/JSONHandler.jsm → remote/cdp/JSONHandler.jsm
@@ -12,9 +12,11 @@ const { HTTP_404, HTTP_505 } = ChromeUtils.import(
   "chrome://remote/content/server/HTTPD.jsm"
 );
 const { Log } = ChromeUtils.import("chrome://remote/content/shared/Log.jsm");
-const { Protocol } = ChromeUtils.import("chrome://remote/content/Protocol.jsm");
+const { Protocol } = ChromeUtils.import(
+  "chrome://remote/content/cdp/Protocol.jsm"
+);
 const { RemoteAgentError } = ChromeUtils.import(
-  "chrome://remote/content/Error.jsm"
+  "chrome://remote/content/cdp/Error.jsm"
 );
 
 class JSONHandler {

diff --git a/remote/Protocol.jsm → remote/cdp/Protocol.jsm b/remote/Protocol.jsm → remote/cdp/Protocol.jsm
diff --git a/remote/RecommendedPreferences.jsm → remote/cdp/RecommendedPreferences.jsm b/remote/RecommendedPreferences.jsm → remote/cdp/RecommendedPreferences.jsm
diff --git a/remote/StreamRegistry.jsm → remote/cdp/StreamRegistry.jsm b/remote/StreamRegistry.jsm → remote/cdp/StreamRegistry.jsm
@@ -20,7 +20,7 @@ XPCOMUtils.defineLazyServiceGetters(this, {
 });
 
 const { UnsupportedError } = ChromeUtils.import(
-  "chrome://remote/content/Error.jsm"
+  "chrome://remote/content/cdp/Error.jsm"
 );
 
 class StreamRegistry {

diff --git a/remote/domains/ContentProcessDomain.jsm → remote/cdp/domains/ContentProcessDomain.jsm b/remote/domains/ContentProcessDomain.jsm → remote/cdp/domains/ContentProcessDomain.jsm
@@ -7,7 +7,7 @@
 var EXPORTED_SYMBOLS = ["ContentProcessDomain"];
 
 const { Domain } = ChromeUtils.import(
-  "chrome://remote/content/domains/Domain.jsm"
+  "chrome://remote/content/cdp/domains/Domain.jsm"
 );
 
 class ContentProcessDomain extends Domain {

diff --git a/remote/cdp/domains/ContentProcessDomains.jsm b/remote/cdp/domains/ContentProcessDomains.jsm
@@ -0,0 +1,25 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+"use strict";
+
+var EXPORTED_SYMBOLS = ["ContentProcessDomains"];
+
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+
+const ContentProcessDomains = {};
+
+XPCOMUtils.defineLazyModuleGetters(ContentProcessDomains, {
+  DOM: "chrome://remote/content/cdp/domains/content/DOM.jsm",
+  Emulation: "chrome://remote/content/cdp/domains/content/Emulation.jsm",
+  Input: "chrome://remote/content/cdp/domains/content/Input.jsm",
+  Log: "chrome://remote/content/cdp/domains/content/Log.jsm",
+  Network: "chrome://remote/content/cdp/domains/content/Network.jsm",
+  Page: "chrome://remote/content/cdp/domains/content/Page.jsm",
+  Performance: "chrome://remote/content/cdp/domains/content/Performance.jsm",
+  Runtime: "chrome://remote/content/cdp/domains/content/Runtime.jsm",
+  Security: "chrome://remote/content/cdp/domains/content/Security.jsm",
+});
diff --git a/remote/domains/Domain.jsm → remote/cdp/domains/Domain.jsm b/remote/domains/Domain.jsm → remote/cdp/domains/Domain.jsm
diff --git a/remote/domains/DomainCache.jsm → remote/cdp/domains/DomainCache.jsm b/remote/domains/DomainCache.jsm → remote/cdp/domains/DomainCache.jsm
@@ -7,10 +7,10 @@
 var EXPORTED_SYMBOLS = ["DomainCache"];
 
 const { Domain } = ChromeUtils.import(
-  "chrome://remote/content/domains/Domain.jsm"
+  "chrome://remote/content/cdp/domains/Domain.jsm"
 );
 const { UnknownMethodError } = ChromeUtils.import(
-  "chrome://remote/content/Error.jsm"
+  "chrome://remote/content/cdp/Error.jsm"
 );
 
 /**

diff --git a/remote/cdp/domains/ParentProcessDomains.jsm b/remote/cdp/domains/ParentProcessDomains.jsm
@@ -0,0 +1,24 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
+"use strict";
+
+var EXPORTED_SYMBOLS = ["ParentProcessDomains"];
+
+const { XPCOMUtils } = ChromeUtils.import(
+  "resource://gre/modules/XPCOMUtils.jsm"
+);
+
+const ParentProcessDomains = {};
+
+XPCOMUtils.defineLazyModuleGetters(ParentProcessDomains, {
+  Browser: "chrome://remote/content/cdp/domains/parent/Browser.jsm",
+  Emulation: "chrome://remote/content/cdp/domains/parent/Emulation.jsm",
+  Input: "chrome://remote/content/cdp/domains/parent/Input.jsm",
+  IO: "chrome://remote/content/cdp/domains/parent/IO.jsm",
+  Network: "chrome://remote/content/cdp/domains/parent/Network.jsm",
+  Page: "chrome://remote/content/cdp/domains/parent/Page.jsm",
+  Security: "chrome://remote/content/cdp/domains/parent/Security.jsm",
+  Target: "chrome://remote/content/cdp/domains/parent/Target.jsm",
+});
diff --git a/remote/domains/content/DOM.jsm → remote/cdp/domains/content/DOM.jsm b/remote/domains/content/DOM.jsm → remote/cdp/domains/content/DOM.jsm
@@ -7,7 +7,7 @@
 var EXPORTED_SYMBOLS = ["DOM"];
 
 const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/domains/ContentProcessDomain.jsm"
+  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
 );
 
 class DOM extends ContentProcessDomain {

diff --git a/remote/domains/content/Emulation.jsm → remote/cdp/domains/content/Emulation.jsm b/remote/domains/content/Emulation.jsm → remote/cdp/domains/content/Emulation.jsm
@@ -7,7 +7,7 @@
 var EXPORTED_SYMBOLS = ["Emulation"];
 
 const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/domains/ContentProcessDomain.jsm"
+  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
 );
 
 class Emulation extends ContentProcessDomain {

diff --git a/remote/domains/content/Input.jsm → remote/cdp/domains/content/Input.jsm b/remote/domains/content/Input.jsm → remote/cdp/domains/content/Input.jsm
@@ -7,7 +7,7 @@
 var EXPORTED_SYMBOLS = ["Input"];
 
 const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/domains/ContentProcessDomain.jsm"
+  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
 );
 
 class Input extends ContentProcessDomain {

diff --git a/remote/domains/content/Log.jsm → remote/cdp/domains/content/Log.jsm b/remote/domains/content/Log.jsm → remote/cdp/domains/content/Log.jsm
@@ -7,7 +7,7 @@
 var EXPORTED_SYMBOLS = ["Log"];
 
 const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/domains/ContentProcessDomain.jsm"
+  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
 );
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 

diff --git a/remote/domains/content/Network.jsm → remote/cdp/domains/content/Network.jsm b/remote/domains/content/Network.jsm → remote/cdp/domains/content/Network.jsm
@@ -7,7 +7,7 @@
 var EXPORTED_SYMBOLS = ["Network"];
 
 const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/domains/ContentProcessDomain.jsm"
+  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
 );
 
 class Network extends ContentProcessDomain {

diff --git a/remote/domains/content/Page.jsm → remote/cdp/domains/content/Page.jsm b/remote/domains/content/Page.jsm → remote/cdp/domains/content/Page.jsm
@@ -11,7 +11,7 @@ const { XPCOMUtils } = ChromeUtils.import(
 );
 
 const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/domains/ContentProcessDomain.jsm"
+  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
 );
 
 XPCOMUtils.defineLazyServiceGetter(

diff --git a/remote/domains/content/Performance.jsm → remote/cdp/domains/content/Performance.jsm b/remote/domains/content/Performance.jsm → remote/cdp/domains/content/Performance.jsm
@@ -7,7 +7,7 @@
 var EXPORTED_SYMBOLS = ["Performance"];
 
 const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/domains/ContentProcessDomain.jsm"
+  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
 );
 
 class Performance extends ContentProcessDomain {

diff --git a/remote/domains/content/Runtime.jsm → remote/cdp/domains/content/Runtime.jsm b/remote/domains/content/Runtime.jsm → remote/cdp/domains/content/Runtime.jsm
@@ -13,10 +13,10 @@ const { addDebuggerToGlobal } = ChromeUtils.import(
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/domains/ContentProcessDomain.jsm"
+  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
 );
 const { ExecutionContext } = ChromeUtils.import(
-  "chrome://remote/content/domains/content/runtime/ExecutionContext.jsm"
+  "chrome://remote/content/cdp/domains/content/runtime/ExecutionContext.jsm"
 );
 const { executeSoon } = ChromeUtils.import(
   "chrome://remote/content/shared/Sync.jsm"

diff --git a/remote/domains/content/Security.jsm → remote/cdp/domains/content/Security.jsm b/remote/domains/content/Security.jsm → remote/cdp/domains/content/Security.jsm
@@ -7,7 +7,7 @@
 var EXPORTED_SYMBOLS = ["Security"];
 
 const { ContentProcessDomain } = ChromeUtils.import(
-  "chrome://remote/content/domains/ContentProcessDomain.jsm"
+  "chrome://remote/content/cdp/domains/ContentProcessDomain.jsm"
 );
 
 class Security extends ContentProcessDomain {

diff --git a/...ains/content/runtime/ExecutionContext.jsm → ...ains/content/runtime/ExecutionContext.jsm b/...ains/content/runtime/ExecutionContext.jsm → ...ains/content/runtime/ExecutionContext.jsm
diff --git a/remote/domains/parent/Browser.jsm → remote/cdp/domains/parent/Browser.jsm b/remote/domains/parent/Browser.jsm → remote/cdp/domains/parent/Browser.jsm
@@ -8,7 +8,7 @@ var EXPORTED_SYMBOLS = ["Browser"];
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { Domain } = ChromeUtils.import(
-  "chrome://remote/content/domains/Domain.jsm"
+  "chrome://remote/content/cdp/domains/Domain.jsm"
 );
 
 class Browser extends Domain {

diff --git a/remote/domains/parent/Emulation.jsm → remote/cdp/domains/parent/Emulation.jsm b/remote/domains/parent/Emulation.jsm → remote/cdp/domains/parent/Emulation.jsm
@@ -9,7 +9,7 @@ var EXPORTED_SYMBOLS = ["Emulation"];
 const { NetUtil } = ChromeUtils.import("resource://gre/modules/NetUtil.jsm");
 
 const { Domain } = ChromeUtils.import(
-  "chrome://remote/content/domains/Domain.jsm"
+  "chrome://remote/content/cdp/domains/Domain.jsm"
 );
 
 const MAX_WINDOW_SIZE = 10000000;

diff --git a/remote/domains/parent/IO.jsm → remote/cdp/domains/parent/IO.jsm b/remote/domains/parent/IO.jsm → remote/cdp/domains/parent/IO.jsm
@@ -15,10 +15,10 @@ XPCOMUtils.defineLazyModuleGetters(this, {
 });
 
 const { Domain } = ChromeUtils.import(
-  "chrome://remote/content/domains/Domain.jsm"
+  "chrome://remote/content/cdp/domains/Domain.jsm"
 );
 const { StreamRegistry } = ChromeUtils.import(
-  "chrome://remote/content/StreamRegistry.jsm"
+  "chrome://remote/content/cdp/StreamRegistry.jsm"
 );
 
 const DEFAULT_CHUNK_SIZE = 10 * 1024 * 1024;

diff --git a/remote/domains/parent/Input.jsm → remote/cdp/domains/parent/Input.jsm b/remote/domains/parent/Input.jsm → remote/cdp/domains/parent/Input.jsm
@@ -9,7 +9,7 @@ var EXPORTED_SYMBOLS = ["Input"];
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const { Domain } = ChromeUtils.import(
-  "chrome://remote/content/domains/Domain.jsm"
+  "chrome://remote/content/cdp/domains/Domain.jsm"
 );
 
 class Input extends Domain {

diff --git a/remote/domains/parent/Network.jsm → remote/cdp/domains/parent/Network.jsm b/remote/domains/parent/Network.jsm → remote/cdp/domains/parent/Network.jsm
@@ -15,7 +15,7 @@ const { XPCOMUtils } = ChromeUtils.import(
 XPCOMUtils.defineLazyGlobalGetters(this, ["URL"]);
 
 const { Domain } = ChromeUtils.import(
-  "chrome://remote/content/domains/Domain.jsm"
+  "chrome://remote/content/cdp/domains/Domain.jsm"
 );
 
 const MAX_COOKIE_EXPIRY = Number.MAX_SAFE_INTEGER;

diff --git a/remote/domains/parent/Page.jsm → remote/cdp/domains/parent/Page.jsm b/remote/domains/parent/Page.jsm → remote/cdp/domains/parent/Page.jsm
@@ -22,16 +22,16 @@ const { clearInterval, setInterval } = ChromeUtils.import(
 );
 
 const { DialogHandler } = ChromeUtils.import(
-  "chrome://remote/content/domains/parent/page/DialogHandler.jsm"
+  "chrome://remote/content/cdp/domains/parent/page/DialogHandler.jsm"
 );
 const { Domain } = ChromeUtils.import(
-  "chrome://remote/content/domains/Domain.jsm"
+  "chrome://remote/content/cdp/domains/Domain.jsm"
 );
 const { UnsupportedError } = ChromeUtils.import(
-  "chrome://remote/content/Error.jsm"
+  "chrome://remote/content/cdp/Error.jsm"
 );
 const { streamRegistry } = ChromeUtils.import(
-  "chrome://remote/content/domains/parent/IO.jsm"
+  "chrome://remote/content/cdp/domains/parent/IO.jsm"
 );
 const { PollPromise } = ChromeUtils.import(
   "chrome://remote/content/shared/Sync.jsm"

diff --git a/remote/domains/parent/Security.jsm → remote/cdp/domains/parent/Security.jsm b/remote/domains/parent/Security.jsm → remote/cdp/domains/parent/Security.jsm
@@ -7,7 +7,7 @@
 var EXPORTED_SYMBOLS = ["Security"];
 
 const { Domain } = ChromeUtils.import(
-  "chrome://remote/content/domains/Domain.jsm"
+  "chrome://remote/content/cdp/domains/Domain.jsm"
 );
 
 const { Preferences } = ChromeUtils.import(

diff --git a/remote/domains/parent/Target.jsm → remote/cdp/domains/parent/Target.jsm b/remote/domains/parent/Target.jsm → remote/cdp/domains/parent/Target.jsm
@@ -20,16 +20,16 @@ const { ContextualIdentityService } = ChromeUtils.import(
   "resource://gre/modules/ContextualIdentityService.jsm"
 );
 const { Domain } = ChromeUtils.import(
-  "chrome://remote/content/domains/Domain.jsm"
+  "chrome://remote/content/cdp/domains/Domain.jsm"
 );
 const { MainProcessTarget } = ChromeUtils.import(
-  "chrome://remote/content/targets/MainProcessTarget.jsm"
+  "chrome://remote/content/cdp/targets/MainProcessTarget.jsm"
 );
 const { TabManager } = ChromeUtils.import(
   "chrome://remote/content/shared/TabManager.jsm"
 );
 const { TabSession } = ChromeUtils.import(
-  "chrome://remote/content/sessions/TabSession.jsm"
+  "chrome://remote/content/cdp/sessions/TabSession.jsm"
 );
 const { WindowManager } = ChromeUtils.import(
   "chrome://remote/content/shared/WindowManager.jsm"

diff --git a/remote/domains/parent/page/DialogHandler.jsm → ...cdp/domains/parent/page/DialogHandler.jsm b/remote/domains/parent/page/DialogHandler.jsm → ...cdp/domains/parent/page/DialogHandler.jsm
diff --git a/remote/observers/ChannelEventSink.jsm → remote/cdp/observers/ChannelEventSink.jsm b/remote/observers/ChannelEventSink.jsm → remote/cdp/observers/ChannelEventSink.jsm
diff --git a/remote/observers/ContextObserver.jsm → remote/cdp/observers/ContextObserver.jsm b/remote/observers/ContextObserver.jsm → remote/cdp/observers/ContextObserver.jsm
diff --git a/remote/observers/NetworkObserver.jsm → remote/cdp/observers/NetworkObserver.jsm b/remote/observers/NetworkObserver.jsm → remote/cdp/observers/NetworkObserver.jsm
@@ -16,7 +16,7 @@ const { CommonUtils } = ChromeUtils.import(
   "resource://services-common/utils.js"
 );
 const { ChannelEventSinkFactory } = ChromeUtils.import(
-  "chrome://remote/content/observers/ChannelEventSink.jsm"
+  "chrome://remote/content/cdp/observers/ChannelEventSink.jsm"
 );
 
 const CC = Components.Constructor;

diff --git a/remote/observers/TargetObserver.jsm → remote/cdp/observers/TargetObserver.jsm b/remote/observers/TargetObserver.jsm → remote/cdp/observers/TargetObserver.jsm
diff --git a/remote/sessions/ContentProcessSession.jsm → ...te/cdp/sessions/ContentProcessSession.jsm b/remote/sessions/ContentProcessSession.jsm → ...te/cdp/sessions/ContentProcessSession.jsm
@@ -7,16 +7,16 @@
 var EXPORTED_SYMBOLS = ["ContentProcessSession"];
 
 const { ContentProcessDomains } = ChromeUtils.import(
-  "chrome://remote/content/domains/ContentProcessDomains.jsm"
+  "chrome://remote/content/cdp/domains/ContentProcessDomains.jsm"
 );
 const { DomainCache } = ChromeUtils.import(
-  "chrome://remote/content/domains/DomainCache.jsm"
+  "chrome://remote/content/cdp/domains/DomainCache.jsm"
 );
 
 ChromeUtils.defineModuleGetter(
   this,
   "ContextObserver",
-  "chrome://remote/content/observers/ContextObserver.jsm"
+  "chrome://remote/content/cdp/observers/ContextObserver.jsm"
 );
 
 class ContentProcessSession {

diff --git a/remote/sessions/MainProcessSession.jsm → remote/cdp/sessions/MainProcessSession.jsm b/remote/sessions/MainProcessSession.jsm → remote/cdp/sessions/MainProcessSession.jsm
@@ -7,7 +7,7 @@
 var EXPORTED_SYMBOLS = ["MainProcessSession"];
 
 const { Session } = ChromeUtils.import(
-  "chrome://remote/content/sessions/Session.jsm"
+  "chrome://remote/content/cdp/sessions/Session.jsm"
 );
 
 /**

diff --git a/remote/sessions/Session.jsm → remote/cdp/sessions/Session.jsm b/remote/sessions/Session.jsm → remote/cdp/sessions/Session.jsm
@@ -7,14 +7,14 @@
 var EXPORTED_SYMBOLS = ["Session"];
 
 const { ParentProcessDomains } = ChromeUtils.import(
-  "chrome://remote/content/domains/ParentProcessDomains.jsm"
+  "chrome://remote/content/cdp/domains/ParentProcessDomains.jsm"
 );
 const { DomainCache } = ChromeUtils.import(
-  "chrome://remote/content/domains/DomainCache.jsm"
+  "chrome://remote/content/cdp/domains/DomainCache.jsm"
 );
 
 const { NetworkObserver } = ChromeUtils.import(
-  "chrome://remote/content/observers/NetworkObserver.jsm"
+  "chrome://remote/content/cdp/observers/NetworkObserver.jsm"
 );
 
 /**

diff --git a/remote/sessions/TabSession.jsm → remote/cdp/sessions/TabSession.jsm b/remote/sessions/TabSession.jsm → remote/cdp/sessions/TabSession.jsm
@@ -7,7 +7,7 @@
 var EXPORTED_SYMBOLS = ["TabSession"];
 
 const { Session } = ChromeUtils.import(
-  "chrome://remote/content/sessions/Session.jsm"
+  "chrome://remote/content/cdp/sessions/Session.jsm"
 );
 
 /**
@@ -40,7 +40,7 @@ class TabSession extends Session {
     this.mm.addMessageListener("remote:error", this);
 
     this.mm.loadFrameScript(
-      "chrome://remote/content/sessions/frame-script.js",
+      "chrome://remote/content/cdp/sessions/frame-script.js",
       false
     );
   }

diff --git a/remote/sessions/frame-script.js → remote/cdp/sessions/frame-script.js b/remote/sessions/frame-script.js → remote/cdp/sessions/frame-script.js
@@ -5,7 +5,7 @@
 "use strict";
 
 const { ContentProcessSession } = ChromeUtils.import(
-  "chrome://remote/content/sessions/ContentProcessSession.jsm"
+  "chrome://remote/content/cdp/sessions/ContentProcessSession.jsm"
 );
 
 /* global content, docShell */