Backed out 3 changesets (bug 1690472, bug 1690469, bug 1690468) for browser_Troubleshoot.js failures CLOSED TREE
authorBogdan Tara <btara@mozilla.com>
Fri, 05 Feb 2021 18:15:26 +0200
changeset 566186 3ee1d2d9feea106c8b7df080193988d533887134
parent 566185 0b4ca02ee3aa0c211abf6375db74e161db5c2ffb
child 566187 5793c988794d3a1188f2707a07bd1f06f3087d96
push id135832
push userbtara@mozilla.com
push dateFri, 05 Feb 2021 16:15:59 +0000
treeherderautoland@3ee1d2d9feea [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1690472, 1690469, 1690468
milestone87.0a1
backs outa8552dfa300990c22327e081f0a1893896fd53e7
dccc9af2fd2d17e00a37c0b3842acabc8582d777
3f2817c73dffebaec803c48779665c37ea2e7b7c
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out 3 changesets (bug 1690472, bug 1690469, bug 1690468) for browser_Troubleshoot.js failures CLOSED TREE Backed out changeset a8552dfa3009 (bug 1690469) Backed out changeset dccc9af2fd2d (bug 1690468) Backed out changeset 3f2817c73dff (bug 1690472)
remote/Cargo.toml
remote/Connection.jsm
remote/Error.jsm
remote/Format.jsm
remote/JSONHandler.jsm
remote/Log.jsm
remote/RemoteAgent.jsm
remote/Sync.jsm
remote/TabManager.jsm
remote/WindowManager.jsm
remote/components.conf
remote/components/RemoteAgent.jsm
remote/components/components.conf
remote/components/moz.build
remote/components/nsIRemoteAgent.idl
remote/components/rust/Cargo.toml
remote/components/rust/RemoteAgentHandler.cpp
remote/components/rust/RemoteAgentHandler.h
remote/components/rust/moz.build
remote/components/rust/src/error.rs
remote/components/rust/src/handler.rs
remote/components/rust/src/lib.rs
remote/components/rust/src/remote_agent.rs
remote/domains/content/Runtime.jsm
remote/domains/parent/Page.jsm
remote/domains/parent/Target.jsm
remote/error.rs
remote/jar.mn
remote/lib.rs
remote/moz.build
remote/nsIRemoteAgent.idl
remote/observers/ContextObserver.jsm
remote/observers/TargetObserver.jsm
remote/remote_agent.rs
remote/server/WebSocketHandshake.jsm
remote/shared/Format.jsm
remote/shared/Log.jsm
remote/shared/Sync.jsm
remote/shared/TabManager.jsm
remote/shared/WindowManager.jsm
remote/startup/RemoteAgentHandler.cpp
remote/startup/RemoteAgentHandler.h
remote/startup/handler.rs
remote/startup/mod.rs
remote/startup/moz.build
remote/targets/MainProcessTarget.jsm
remote/targets/TabTarget.jsm
remote/test/browser/head.js
remote/test/browser/page/head.js
remote/test/unit/test_Format.js
remote/test/unit/test_Sync.js
toolkit/library/rust/shared/Cargo.toml
rename from remote/components/rust/Cargo.toml
rename to remote/Cargo.toml
--- a/remote/components/rust/Cargo.toml
+++ b/remote/Cargo.toml
@@ -1,12 +1,15 @@
 [package]
 name = "remote"
 version = "0.1.0"
 
+[lib]
+path = "lib.rs"
+
 [dependencies]
 http = "0.2"
 libc = "0.2"
 log = "0.4"
-nserror = { path = "../../../xpcom/rust/nserror" }
-nsstring = { path = "../../../xpcom/rust/nsstring" }
+nserror = { path = "../xpcom/rust/nserror" }
+nsstring = { path = "../xpcom/rust/nsstring" }
 thiserror = "1"
-xpcom = { path = "../../../xpcom/rust/xpcom" }
+xpcom = { path = "../xpcom/rust/xpcom" }
--- a/remote/Connection.jsm
+++ b/remote/Connection.jsm
@@ -5,20 +5,18 @@
 "use strict";
 
 var EXPORTED_SYMBOLS = ["Connection"];
 
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
-const { truncate } = ChromeUtils.import(
-  "chrome://remote/content/shared/Format.jsm"
-);
-const { Log } = ChromeUtils.import("chrome://remote/content/shared/Log.jsm");
+const { truncate } = ChromeUtils.import("chrome://remote/content/Format.jsm");
+const { Log } = ChromeUtils.import("chrome://remote/content/Log.jsm");
 const { UnknownMethodError } = ChromeUtils.import(
   "chrome://remote/content/Error.jsm"
 );
 
 XPCOMUtils.defineLazyGetter(this, "log", Log.get);
 XPCOMUtils.defineLazyServiceGetter(
   this,
   "UUIDGen",
--- a/remote/Error.jsm
+++ b/remote/Error.jsm
@@ -6,17 +6,17 @@
 
 var EXPORTED_SYMBOLS = [
   "FatalError",
   "RemoteAgentError",
   "UnknownMethodError",
   "UnsupportedError",
 ];
 
-const { Log } = ChromeUtils.import("chrome://remote/content/shared/Log.jsm");
+const { Log } = ChromeUtils.import("chrome://remote/content/Log.jsm");
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyGetter(this, "log", Log.get);
 
 class RemoteAgentError extends Error {
rename from remote/shared/Format.jsm
rename to remote/Format.jsm
--- a/remote/shared/Format.jsm
+++ b/remote/Format.jsm
@@ -1,17 +1,17 @@
 /* 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 = ["pprint", "truncate"];
 
-const { Log } = ChromeUtils.import("chrome://remote/content/shared/Log.jsm");
+const { Log } = ChromeUtils.import("chrome://remote/content/Log.jsm");
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyGetter(this, "log", Log.get);
 
--- a/remote/JSONHandler.jsm
+++ b/remote/JSONHandler.jsm
@@ -6,17 +6,17 @@
 
 var EXPORTED_SYMBOLS = ["JSONHandler"];
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const { HTTP_404, HTTP_505 } = ChromeUtils.import(
   "chrome://remote/content/server/HTTPD.jsm"
 );
-const { Log } = ChromeUtils.import("chrome://remote/content/shared/Log.jsm");
+const { Log } = ChromeUtils.import("chrome://remote/content/Log.jsm");
 const { Protocol } = ChromeUtils.import("chrome://remote/content/Protocol.jsm");
 const { RemoteAgentError } = ChromeUtils.import(
   "chrome://remote/content/Error.jsm"
 );
 
 class JSONHandler {
   constructor(agent) {
     this.agent = agent;
rename from remote/shared/Log.jsm
rename to remote/Log.jsm
rename from remote/components/RemoteAgent.jsm
rename to remote/RemoteAgent.jsm
--- a/remote/components/RemoteAgent.jsm
+++ b/remote/RemoteAgent.jsm
@@ -9,17 +9,17 @@ var EXPORTED_SYMBOLS = ["RemoteAgent", "
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
 XPCOMUtils.defineLazyModuleGetters(this, {
   HttpServer: "chrome://remote/content/server/HTTPD.jsm",
   JSONHandler: "chrome://remote/content/JSONHandler.jsm",
-  Log: "chrome://remote/content/shared/Log.jsm",
+  Log: "chrome://remote/content/Log.jsm",
   Preferences: "resource://gre/modules/Preferences.jsm",
   RecommendedPreferences: "chrome://remote/content/RecommendedPreferences.jsm",
   TargetList: "chrome://remote/content/targets/TargetList.jsm",
 });
 XPCOMUtils.defineLazyGetter(this, "log", Log.get);
 
 const ENABLED = "remote.enabled";
 const FORCE_LOCAL = "remote.force-local";
rename from remote/shared/Sync.jsm
rename to remote/Sync.jsm
rename from remote/shared/TabManager.jsm
rename to remote/TabManager.jsm
rename from remote/shared/WindowManager.jsm
rename to remote/WindowManager.jsm
--- a/remote/shared/WindowManager.jsm
+++ b/remote/WindowManager.jsm
@@ -2,19 +2,17 @@
  * 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 = ["WindowManager"];
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
-const { EventPromise } = ChromeUtils.import(
-  "chrome://remote/content/shared/Sync.jsm"
-);
+const { EventPromise } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
 
 var WindowManager = {
   async focus(window) {
     if (window != Services.focus.activeWindow) {
       const promises = [
         EventPromise(window, "activate"),
         EventPromise(window, "focus", { capture: true }),
       ];
rename from remote/components/components.conf
rename to remote/components.conf
--- a/remote/components/components.conf
+++ b/remote/components.conf
@@ -1,17 +1,17 @@
 # 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/.
 
 Classes = [
     {
         "cid": "{8f685a9d-8181-46d6-a71d-869289099c6d}",
         "contract_ids": ["@mozilla.org/remote/agent;1"],
-        "jsm": "chrome://remote/content/components/RemoteAgent.jsm",
+        "jsm": "chrome://remote/content/RemoteAgent.jsm",
         "constructor": "RemoteAgentFactory",
     },
     {
         "cid": "{0d1bb02e-ac91-4904-b61d-97da83ebf6fb}",
         "contract_ids": ["@mozilla.org/commandlinehandler/general-startup;1?type=remote"],
         "categories": {"command-line-handler": "m-remote"},
         "headers": ["RemoteAgentHandler.h"],
         "constructor": "GetRemoteAgentHandler",
deleted file mode 100644
--- a/remote/components/moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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/.
-
-DIRS += [
-    "rust",
-]
-
-XPIDL_MODULE = "remote"
-XPIDL_SOURCES += ["nsIRemoteAgent.idl"]
-
-XPCOM_MANIFESTS += ["components.conf"]
--- a/remote/domains/content/Runtime.jsm
+++ b/remote/domains/content/Runtime.jsm
@@ -13,19 +13,17 @@ const { addDebuggerToGlobal } = ChromeUt
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 const { ContentProcessDomain } = ChromeUtils.import(
   "chrome://remote/content/domains/ContentProcessDomain.jsm"
 );
 const { ExecutionContext } = ChromeUtils.import(
   "chrome://remote/content/domains/content/runtime/ExecutionContext.jsm"
 );
-const { executeSoon } = ChromeUtils.import(
-  "chrome://remote/content/shared/Sync.jsm"
-);
+const { executeSoon } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
 
 // Import the `Debugger` constructor in the current scope
 addDebuggerToGlobal(Cu.getGlobalForObject(this));
 
 const OBSERVER_CONSOLE_API = "console-api-log-event";
 
 const CONSOLE_API_LEVEL_MAP = {
   warn: "warning",
--- a/remote/domains/parent/Page.jsm
+++ b/remote/domains/parent/Page.jsm
@@ -28,24 +28,22 @@ const { Domain } = ChromeUtils.import(
   "chrome://remote/content/domains/Domain.jsm"
 );
 const { UnsupportedError } = ChromeUtils.import(
   "chrome://remote/content/Error.jsm"
 );
 const { streamRegistry } = ChromeUtils.import(
   "chrome://remote/content/domains/parent/IO.jsm"
 );
-const { PollPromise } = ChromeUtils.import(
-  "chrome://remote/content/shared/Sync.jsm"
-);
+const { PollPromise } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
 const { TabManager } = ChromeUtils.import(
-  "chrome://remote/content/shared/TabManager.jsm"
+  "chrome://remote/content/TabManager.jsm"
 );
 const { WindowManager } = ChromeUtils.import(
-  "chrome://remote/content/shared/WindowManager.jsm"
+  "chrome://remote/content/WindowManager.jsm"
 );
 
 const MAX_CANVAS_DIMENSION = 32767;
 const MAX_CANVAS_AREA = 472907776;
 
 const PRINT_MAX_SCALE_VALUE = 2.0;
 const PRINT_MIN_SCALE_VALUE = 0.1;
 
--- a/remote/domains/parent/Target.jsm
+++ b/remote/domains/parent/Target.jsm
@@ -21,23 +21,23 @@ const { ContextualIdentityService } = Ch
 );
 const { Domain } = ChromeUtils.import(
   "chrome://remote/content/domains/Domain.jsm"
 );
 const { MainProcessTarget } = ChromeUtils.import(
   "chrome://remote/content/targets/MainProcessTarget.jsm"
 );
 const { TabManager } = ChromeUtils.import(
-  "chrome://remote/content/shared/TabManager.jsm"
+  "chrome://remote/content/TabManager.jsm"
 );
 const { TabSession } = ChromeUtils.import(
   "chrome://remote/content/sessions/TabSession.jsm"
 );
 const { WindowManager } = ChromeUtils.import(
-  "chrome://remote/content/shared/WindowManager.jsm"
+  "chrome://remote/content/WindowManager.jsm"
 );
 
 let browserContextIds = 1;
 
 class Target extends Domain {
   constructor(session) {
     super(session);
 
rename from remote/components/rust/src/error.rs
rename to remote/error.rs
--- a/remote/jar.mn
+++ b/remote/jar.mn
@@ -1,22 +1,27 @@
 # 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/.
 
 remote.jar:
 % content remote %content/
-  content/components/RemoteAgent.jsm (components/RemoteAgent.jsm)
+  content/RemoteAgent.jsm (RemoteAgent.jsm)
 
   content/Connection.jsm (Connection.jsm)
   content/Error.jsm (Error.jsm)
+  content/Format.jsm (Format.jsm)
   content/JSONHandler.jsm (JSONHandler.jsm)
+  content/Log.jsm (Log.jsm)
   content/Protocol.jsm (Protocol.jsm)
   content/RecommendedPreferences.jsm (RecommendedPreferences.jsm)
   content/StreamRegistry.jsm (StreamRegistry.jsm)
+  content/Sync.jsm (Sync.jsm)
+  content/TabManager.jsm (TabManager.jsm)
+  content/WindowManager.jsm (WindowManager.jsm)
 
   # observers
   content/observers/ChannelEventSink.jsm (observers/ChannelEventSink.jsm)
   content/observers/ContextObserver.jsm (observers/ContextObserver.jsm)
   content/observers/NetworkObserver.jsm (observers/NetworkObserver.jsm)
   content/observers/TargetObserver.jsm (observers/TargetObserver.jsm)
 
   # sessions
@@ -58,17 +63,10 @@ remote.jar:
   content/domains/parent/Security.jsm (domains/parent/Security.jsm)
   content/domains/parent/Target.jsm (domains/parent/Target.jsm)
 
   # transport layer
   content/server/HTTPD.jsm (../netwerk/test/httpserver/httpd.js)
   content/server/WebSocketHandshake.jsm (server/WebSocketHandshake.jsm)
   content/server/WebSocketTransport.jsm (server/WebSocketTransport.jsm)
 
-  # shared modules
-  content/shared/Format.jsm (shared/Format.jsm)
-  content/shared/Log.jsm (shared/Log.jsm)
-  content/shared/Sync.jsm (shared/Sync.jsm)
-  content/shared/TabManager.jsm (shared/TabManager.jsm)
-  content/shared/WindowManager.jsm (shared/WindowManager.jsm)
-
   # imports from external folders
   content/external/EventUtils.js (../testing/mochitest/tests/SimpleTest/EventUtils.js)
rename from remote/components/rust/src/lib.rs
rename to remote/lib.rs
--- a/remote/components/rust/src/lib.rs
+++ b/remote/lib.rs
@@ -6,13 +6,13 @@ extern crate http;
 extern crate libc;
 extern crate log;
 extern crate nserror;
 extern crate nsstring;
 extern crate thiserror;
 extern crate xpcom;
 
 mod error;
-mod handler;
 mod remote_agent;
+mod startup;
 
 pub use crate::error::RemoteAgentError;
 pub use crate::remote_agent::{RemoteAgent, RemoteAgentResult, DEFAULT_HOST, DEFAULT_PORT};
--- a/remote/moz.build
+++ b/remote/moz.build
@@ -1,19 +1,23 @@
 # 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/.
 
 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"):
     BUG_COMPONENT = ("Remote Protocol", "Emulation")
 with Files("domains/**/DOM.jsm"):
     BUG_COMPONENT = ("Remote Protocol", "DOM")
 with Files("domains/**/Input.jsm"):
     BUG_COMPONENT = ("Remote Protocol", "Input")
rename from remote/components/nsIRemoteAgent.idl
rename to remote/nsIRemoteAgent.idl
--- a/remote/observers/ContextObserver.jsm
+++ b/remote/observers/ContextObserver.jsm
@@ -25,19 +25,17 @@
 
 var EXPORTED_SYMBOLS = ["ContextObserver"];
 
 const { EventEmitter } = ChromeUtils.import(
   "resource://gre/modules/EventEmitter.jsm"
 );
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
-const { executeSoon } = ChromeUtils.import(
-  "chrome://remote/content/shared/Sync.jsm"
-);
+const { executeSoon } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
 
 class ContextObserver {
   constructor(chromeEventHandler) {
     this.chromeEventHandler = chromeEventHandler;
     EventEmitter.decorate(this);
 
     this.chromeEventHandler.addEventListener("DOMWindowCreated", this, {
       mozSystemGroup: true,
--- a/remote/observers/TargetObserver.jsm
+++ b/remote/observers/TargetObserver.jsm
@@ -1,19 +1,17 @@
 /* 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 = ["TabObserver"];
 
-const { EventPromise } = ChromeUtils.import(
-  "chrome://remote/content/shared/Sync.jsm"
-);
+const { EventPromise } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
 const { EventEmitter } = ChromeUtils.import(
   "resource://gre/modules/EventEmitter.jsm"
 );
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
 // TODO(ato):
 //
 // The DOM team is working on pulling browsing context related behaviour,
rename from remote/components/rust/src/remote_agent.rs
rename to remote/remote_agent.rs
--- a/remote/server/WebSocketHandshake.jsm
+++ b/remote/server/WebSocketHandshake.jsm
@@ -10,19 +10,17 @@ var EXPORTED_SYMBOLS = ["WebSocketHandsh
 
 const CC = Components.Constructor;
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 
-const { executeSoon } = ChromeUtils.import(
-  "chrome://remote/content/shared/Sync.jsm"
-);
+const { executeSoon } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
 
 XPCOMUtils.defineLazyGetter(this, "WebSocket", () => {
   return Services.appShell.hiddenDOMWindow.WebSocket;
 });
 
 const CryptoHash = CC(
   "@mozilla.org/security/hash;1",
   "nsICryptoHash",
rename from remote/components/rust/RemoteAgentHandler.cpp
rename to remote/startup/RemoteAgentHandler.cpp
rename from remote/components/rust/RemoteAgentHandler.h
rename to remote/startup/RemoteAgentHandler.h
rename from remote/components/rust/src/handler.rs
rename to remote/startup/handler.rs
new file mode 100644
--- /dev/null
+++ b/remote/startup/mod.rs
@@ -0,0 +1,5 @@
+// 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/.
+
+mod handler;
rename from remote/components/rust/moz.build
rename to remote/startup/moz.build
--- a/remote/targets/MainProcessTarget.jsm
+++ b/remote/targets/MainProcessTarget.jsm
@@ -8,17 +8,17 @@ var EXPORTED_SYMBOLS = ["MainProcessTarg
 
 const { Target } = ChromeUtils.import(
   "chrome://remote/content/targets/Target.jsm"
 );
 const { MainProcessSession } = ChromeUtils.import(
   "chrome://remote/content/sessions/MainProcessSession.jsm"
 );
 const { RemoteAgent } = ChromeUtils.import(
-  "chrome://remote/content/components/RemoteAgent.jsm"
+  "chrome://remote/content/RemoteAgent.jsm"
 );
 
 /**
  * The main process Target.
  *
  * Matches BrowserDevToolsAgentHost from chromium, and only support a couple of Domains:
  * https://cs.chromium.org/chromium/src/content/browser/devtools/browser_devtools_agent_host.cc?dr=CSs&g=0&l=80-91
  */
--- a/remote/targets/TabTarget.jsm
+++ b/remote/targets/TabTarget.jsm
@@ -12,17 +12,17 @@ const { Target } = ChromeUtils.import(
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 const { TabSession } = ChromeUtils.import(
   "chrome://remote/content/sessions/TabSession.jsm"
 );
 const { XPCOMUtils } = ChromeUtils.import(
   "resource://gre/modules/XPCOMUtils.jsm"
 );
 const { RemoteAgent } = ChromeUtils.import(
-  "chrome://remote/content/components/RemoteAgent.jsm"
+  "chrome://remote/content/RemoteAgent.jsm"
 );
 
 XPCOMUtils.defineLazyServiceGetter(
   this,
   "Favicons",
   "@mozilla.org/browser/favicon-service;1",
   "nsIFaviconService"
 );
--- a/remote/test/browser/head.js
+++ b/remote/test/browser/head.js
@@ -1,21 +1,21 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 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;
 
 /*
 add_task() is overriden to setup and teardown a test environment
 making it easier to  write browser-chrome tests for the remote
 debugger.
--- a/remote/test/browser/page/head.js
+++ b/remote/test/browser/page/head.js
@@ -12,19 +12,17 @@ Services.scriptloader.loadSubScript(
 
 const {
   clearInterval,
   clearTimeout,
   setInterval,
   setTimeout,
 } = ChromeUtils.import("resource://gre/modules/Timer.jsm");
 
-const { PollPromise } = ChromeUtils.import(
-  "chrome://remote/content/shared/Sync.jsm"
-);
+const { PollPromise } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
 
 const TIMEOUT_SET_HISTORY_INDEX = 1000;
 
 function assertHistoryEntries(history, expectedData, expectedIndex) {
   const { currentIndex, entries } = history;
 
   is(currentIndex, expectedIndex, "Got expected current index");
   is(
--- a/remote/test/unit/test_Format.js
+++ b/remote/test/unit/test_Format.js
@@ -1,15 +1,15 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
 const { truncate, pprint } = ChromeUtils.import(
-  "chrome://remote/content/shared/Format.jsm"
+  "chrome://remote/content/Format.jsm"
 );
 
 const MAX_STRING_LENGTH = 250;
 const HALF = "x".repeat(MAX_STRING_LENGTH / 2);
 
 add_test(function test_pprint() {
   equal('[object Object] {"foo":"bar"}', pprint`${{ foo: "bar" }}`);
 
--- a/remote/test/unit/test_Sync.js
+++ b/remote/test/unit/test_Sync.js
@@ -1,17 +1,15 @@
 /* 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/. */
 
 const { Services } = ChromeUtils.import("resource://gre/modules/Services.jsm");
 
-const { PollPromise } = ChromeUtils.import(
-  "chrome://remote/content/shared/Sync.jsm"
-);
+const { PollPromise } = ChromeUtils.import("chrome://remote/content/Sync.jsm");
 
 /**
  * Mimic a DOM node for listening for events.
  */
 class MockElement {
   constructor() {
     this.capture = false;
     this.func = null;
@@ -102,17 +100,17 @@ class MockTimer {
     this.cancelled = true;
   }
 }
 
 add_test(function test_executeSoon_callback() {
   // executeSoon() is already defined for xpcshell in head.js. As such import
   // our implementation into a custom namespace.
   let sync = {};
-  ChromeUtils.import("chrome://remote/content/shared/Sync.jsm", sync);
+  ChromeUtils.import("chrome://remote/content/Sync.jsm", sync);
 
   for (let func of ["foo", null, true, [], {}]) {
     Assert.throws(() => sync.executeSoon(func), /TypeError/);
   }
 
   let a;
   sync.executeSoon(() => {
     a = 1;
--- a/toolkit/library/rust/shared/Cargo.toml
+++ b/toolkit/library/rust/shared/Cargo.toml
@@ -42,17 +42,17 @@ bookmark_sync = { path = "../../../compo
 shift_or_euc_c = "0.1.0"
 chardetng_c = "0.1.1"
 audio_thread_priority = "0.23.4"
 mdns_service = { path="../../../../dom/media/webrtc/transport/mdns_service", optional = true }
 neqo_glue = { path = "../../../../netwerk/socket/neqo_glue" }
 rlbox_lucet_sandbox = { version = "0.1.0", optional = true }
 wgpu_bindings = { path = "../../../../gfx/wgpu_bindings", optional = true }
 mapped_hyph = { git = "https://github.com/jfkthame/mapped_hyph.git", rev = "578d7058a638c955a597f035ce1a11049c3021d7" }
-remote = { path = "../../../../remote/components/rust", optional = true }
+remote = { path = "../../../../remote", optional = true }
 fog_control = { path = "../../../components/glean", optional = true }
 app_services_logger = { path = "../../../../services/common/app_services_logger" }
 http_sfv = { path = "../../../../netwerk/base/http-sfv" }
 unic-langid = { version = "0.9", features = ["likelysubtags"] }
 unic-langid-ffi = { path = "../../../../intl/locale/rust/unic-langid-ffi" }
 fluent-langneg = { version = "0.13", features = ["cldr"] }
 fluent-langneg-ffi = { path = "../../../../intl/locale/rust/fluent-langneg-ffi" }
 rust_minidump_writer_linux = { path = "../../../crashreporter/rust_minidump_writer_linux", optional = true }