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

@@ -0,0 +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" }
+thiserror = "1"
+xpcom = { path = "../xpcom/rust/xpcom" }

remote/Connection.jsm

@@ -10,10 +10,8 @@ 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"
 );

remote/Error.jsm

@@ -11,7 +11,7 @@ var EXPORTED_SYMBOLS = [
   "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"

remote/Format.jsm

@@ -6,7 +6,7 @@
 
 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(

remote/JSONHandler.jsm

@@ -11,7 +11,7 @@ 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"

remote/RemoteAgent.jsm

@@ -14,7 +14,7 @@ const { XPCOMUtils } = ChromeUtils.import(
 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",

remote/WindowManager.jsm

@@ -7,9 +7,7 @@
 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) {

remote/components.conf

@@ -6,7 +6,7 @@ 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",
     },
     {

remote/components/moz.build

@@ -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"]

remote/components/rust/Cargo.toml

@@ -1,12 +0,0 @@
-[package]
-name = "remote"
-version = "0.1.0"
-
-[dependencies]
-http = "0.2"
-libc = "0.2"
-log = "0.4"
-nserror = { path = "../../../xpcom/rust/nserror" }
-nsstring = { path = "../../../xpcom/rust/nsstring" }
-thiserror = "1"
-xpcom = { path = "../../../xpcom/rust/xpcom" }

remote/domains/content/Runtime.jsm

@@ -18,9 +18,7 @@ const { ContentProcessDomain } = ChromeUtils.import(
 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));

remote/domains/parent/Page.jsm

@@ -33,14 +33,12 @@ const { UnsupportedError } = ChromeUtils.import(
 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;

remote/domains/parent/Target.jsm

@@ -26,13 +26,13 @@ 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;

remote/jar.mn

@@ -4,14 +4,19 @@
 
 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)
@@ -63,12 +68,5 @@ remote.jar:
   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)

remote/lib.rs

@@ -11,8 +11,8 @@ 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};

remote/moz.build

@@ -3,12 +3,16 @@
 # 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"):

remote/observers/ContextObserver.jsm

@@ -30,9 +30,7 @@ const { EventEmitter } = ChromeUtils.import(
 );
 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) {

remote/observers/TargetObserver.jsm

@@ -6,9 +6,7 @@
 
 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"
 );

remote/server/WebSocketHandshake.jsm

@@ -15,9 +15,7 @@ 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;

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;

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/components/RemoteAgent.jsm"
+  "chrome://remote/content/RemoteAgent.jsm"
 );
 
 /**

remote/targets/TabTarget.jsm

@@ -17,7 +17,7 @@ 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(

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;

remote/test/browser/page/head.js

@@ -17,9 +17,7 @@ const {
   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;
 

remote/test/unit/test_Format.js

@@ -4,7 +4,7 @@
 "use strict";
 
 const { truncate, pprint } = ChromeUtils.import(
-  "chrome://remote/content/shared/Format.jsm"
+  "chrome://remote/content/Format.jsm"
 );
 
 const MAX_STRING_LENGTH = 250;

remote/test/unit/test_Sync.js

@@ -4,9 +4,7 @@
 
 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.
@@ -107,7 +105,7 @@ 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/);

toolkit/library/rust/shared/Cargo.toml

@@ -47,7 +47,7 @@ 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" }