Bug 1690468 - [remote] Move Remote Agent component related files to c…

…omponents/. r=remote-protocol-reviewers,jgraham,mak Differential Revision: https://phabricator.services.mozilla.com/D104159
dothq · Feb 8, 2021 · d461492 · d461492
1 parent a82f8b1
commit d461492
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 12 deletions.
diff --git a/remote/RemoteAgent.jsm → remote/components/RemoteAgent.jsm b/remote/RemoteAgent.jsm → remote/components/RemoteAgent.jsm
diff --git a/remote/components.conf → remote/components/components.conf b/remote/components.conf → remote/components/components.conf
@@ -6,7 +6,7 @@ Classes = [
     {
         "cid": "{8f685a9d-8181-46d6-a71d-869289099c6d}",
         "contract_ids": ["@mozilla.org/remote/agent;1"],
-        "jsm": "chrome://remote/content/RemoteAgent.jsm",
+        "jsm": "chrome://remote/content/components/RemoteAgent.jsm",
         "constructor": "RemoteAgentFactory",
     },
     {

diff --git a/remote/components/moz.build b/remote/components/moz.build
@@ -0,0 +1,8 @@
+# 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/.
+
+XPIDL_MODULE = "remote"
+XPIDL_SOURCES += ["nsIRemoteAgent.idl"]
+
+XPCOM_MANIFESTS += ["components.conf"]
diff --git a/remote/nsIRemoteAgent.idl → remote/components/nsIRemoteAgent.idl b/remote/nsIRemoteAgent.idl → remote/components/nsIRemoteAgent.idl
diff --git a/remote/jar.mn b/remote/jar.mn
@@ -4,7 +4,7 @@
 
 remote.jar:
 % content remote %content/
-  content/RemoteAgent.jsm (RemoteAgent.jsm)
+  content/components/RemoteAgent.jsm (components/RemoteAgent.jsm)
 
   content/Connection.jsm (Connection.jsm)
   content/Error.jsm (Error.jsm)

diff --git a/remote/moz.build b/remote/moz.build
@@ -3,16 +3,13 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 DIRS += [
+    "components",
     "startup",
     "test",
 ]
 
-XPCOM_MANIFESTS += ["components.conf"]
 JAR_MANIFESTS += ["jar.mn"]
 
-XPIDL_MODULE = "remote"
-XPIDL_SOURCES += ["nsIRemoteAgent.idl"]
-
 with Files("**"):
     BUG_COMPONENT = ("Remote Protocol", "Agent")
 with Files("domains/**/Emulation.jsm"):

diff --git a/remote/targets/MainProcessTarget.jsm b/remote/targets/MainProcessTarget.jsm
@@ -13,7 +13,7 @@ const { MainProcessSession } = ChromeUtils.import(
   "chrome://remote/content/sessions/MainProcessSession.jsm"
 );
 const { RemoteAgent } = ChromeUtils.import(
-  "chrome://remote/content/RemoteAgent.jsm"
+  "chrome://remote/content/components/RemoteAgent.jsm"
 );
 
 /**

diff --git a/remote/targets/TabTarget.jsm b/remote/targets/TabTarget.jsm
@@ -17,7 +17,7 @@ const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 const { RemoteAgent } = ChromeUtils.import(
-  "chrome://remote/content/RemoteAgent.jsm"
+  "chrome://remote/content/components/RemoteAgent.jsm"
 );
 
 XPCOMUtils.defineLazyServiceGetter(

diff --git a/remote/test/browser/head.js b/remote/test/browser/head.js
@@ -5,12 +5,12 @@
 
 const { OS } = ChromeUtils.import("resource://gre/modules/osfile.jsm");
 
+const { RemoteAgent } = ChromeUtils.import(
+  "chrome://remote/content/components/RemoteAgent.jsm"
+);
 const { RemoteAgentError } = ChromeUtils.import(
   "chrome://remote/content/Error.jsm"
 );
-const { RemoteAgent } = ChromeUtils.import(
-  "chrome://remote/content/RemoteAgent.jsm"
-);
 
 const TIMEOUT_MULTIPLIER = SpecialPowers.isDebugBuild ? 4 : 1;
 const TIMEOUT_EVENTS = 1000 * TIMEOUT_MULTIPLIER;

diff --git a/toolkit/modules/Troubleshoot.jsm b/toolkit/modules/Troubleshoot.jsm
@@ -953,7 +953,7 @@ if (AppConstants.MOZ_SANDBOX) {
 if (AppConstants.ENABLE_REMOTE_AGENT) {
   dataProviders.remoteAgent = function remoteAgent(done) {
     const { RemoteAgent } = ChromeUtils.import(
-      "chrome://remote/content/RemoteAgent.jsm"
+      "chrome://remote/content/components/RemoteAgent.jsm"
     );
     const { listening, scheme, host, port } = RemoteAgent;
     let url = "";