From a3c7499a5505c506ba54b837d8ec3e4c790a3782 Mon Sep 17 00:00:00 2001
From: Alexandre Poirot <poirot.alex@gmail.com>
Date: Tue, 25 Sep 2018 19:33:52 +0300
Subject: [PATCH] Bug 1473513 - Backed out changeset 174fe98999ea for failures
 on mobile/android/tests/browser/chrome/test_debugger_server.html CLOSED TREE

Summary:
MozReview-Commit-ID: GfSX2wYfLrN

Depends on D6803

Bug #: 1473513

Differential Revision: https://phabricator.services.mozilla.com/D6804

--HG--
rename : devtools/server/actors/utils/actor-registry.js => devtools/server/actor-registry.js
---
 devtools/client/debugger/test/mochitest/head.js                 | 2 +-
 devtools/client/shared/test/shared-head.js                      | 2 +-
 devtools/docs/backend/actor-registration.md                     | 2 +-
 devtools/docs/backend/protocol.js.md                            | 2 +-
 devtools/server/{actors/utils => }/actor-registry.js            | 0
 devtools/server/actors/targets/browsing-context.js              | 2 +-
 devtools/server/actors/utils/actor-registry-utils.js            | 2 +-
 devtools/server/actors/utils/moz.build                          | 1 -
 devtools/server/actors/webbrowser.js                            | 2 +-
 devtools/server/main.js                                         | 2 +-
 devtools/server/moz.build                                       | 1 +
 devtools/server/tests/browser/head.js                           | 2 +-
 devtools/server/tests/mochitest/test_connectToFrame.html        | 2 +-
 devtools/server/tests/unit/head_dbg.js                          | 2 +-
 devtools/server/tests/unit/testactors.js                        | 2 +-
 devtools/shared/security/tests/unit/testactors.js               | 2 +-
 devtools/shared/transport/tests/unit/head_dbg.js                | 2 +-
 devtools/shared/transport/tests/unit/testactors-no-bulk.js      | 2 +-
 devtools/shared/transport/tests/unit/testactors.js              | 2 +-
 .../talos/tests/devtools/addon/content/tests/server/protocol.js | 2 +-
 20 files changed, 18 insertions(+), 18 deletions(-)
 rename devtools/server/{actors/utils => }/actor-registry.js (100%)

diff --git a/devtools/client/debugger/test/mochitest/head.js b/devtools/client/debugger/test/mochitest/head.js
index 857e23b41d04..fb0976c0ee4c 100644
--- a/devtools/client/debugger/test/mochitest/head.js
+++ b/devtools/client/debugger/test/mochitest/head.js
@@ -16,7 +16,7 @@ Services.prefs.setBoolPref("devtools.debugger.log", false);
 
 var { BrowserToolboxProcess } = ChromeUtils.import("resource://devtools/client/framework/ToolboxProcess.jsm", {});
 var { DebuggerServer } = require("devtools/server/main");
-var { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
+var { ActorRegistry } = require("devtools/server/actor-registry");
 var { DebuggerClient } = require("devtools/shared/client/debugger-client");
 var ObjectClient = require("devtools/shared/client/object-client");
 var { AddonManager } = ChromeUtils.import("resource://gre/modules/AddonManager.jsm", {});
diff --git a/devtools/client/shared/test/shared-head.js b/devtools/client/shared/test/shared-head.js
index 09d07b99bffe..0c2d66db96de 100644
--- a/devtools/client/shared/test/shared-head.js
+++ b/devtools/client/shared/test/shared-head.js
@@ -755,7 +755,7 @@ async function registerActorInContentProcess(url, options) {
   return ContentTask.spawn(gBrowser.selectedBrowser, { url, options }, args => {
     // eslint-disable-next-line no-shadow
     const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
-    const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
+    const { ActorRegistry } = require("devtools/server/actor-registry");
     ActorRegistry.registerModule(args.url, args.options);
   });
 }
diff --git a/devtools/docs/backend/actor-registration.md b/devtools/docs/backend/actor-registration.md
index 6d677c35347c..dfc59eb160ce 100644
--- a/devtools/docs/backend/actor-registration.md
+++ b/devtools/docs/backend/actor-registration.md
@@ -30,7 +30,7 @@ ActorRegistry.registerModule("devtools/server/actors/addon/addons", {
 });
 ```
 
-If you are adding a new built-in actor, you should be registering it using `ActorRegistry.registerModule` in `addBrowserActors` or `addTargetScopedActors` in `/devtools/server/actors/utils/actor-registry.js`.
+If you are adding a new built-in actor, you should be registering it using `ActorRegistry.registerModule` in `addBrowserActors` or `addTargetScopedActors` in `/devtools/server/actor-registry.js`.
 
 ## A note about lazy registration
 
diff --git a/devtools/docs/backend/protocol.js.md b/devtools/docs/backend/protocol.js.md
index 7692faf29b63..cb80579900c1 100644
--- a/devtools/docs/backend/protocol.js.md
+++ b/devtools/docs/backend/protocol.js.md
@@ -51,7 +51,7 @@ The actor implementation would go somewhere like
     // You also need to export the actor class in your module for discovery.
     exports.HelloActor = HelloActor;
 
-To activate your actor, register it in the `addBrowserActors` method in `server/actors/utils/actor-registry.js`.
+To activate your actor, register it in the `addBrowserActors` method in `server/actor-registry.js`.
 The registration code would look something like this:
 
     this.registerModule("devtools/server/actors/hello-world", {
diff --git a/devtools/server/actors/utils/actor-registry.js b/devtools/server/actor-registry.js
similarity index 100%
rename from devtools/server/actors/utils/actor-registry.js
rename to devtools/server/actor-registry.js
diff --git a/devtools/server/actors/targets/browsing-context.js b/devtools/server/actors/targets/browsing-context.js
index 647d4ba184b4..cf266476a40f 100644
--- a/devtools/server/actors/targets/browsing-context.js
+++ b/devtools/server/actors/targets/browsing-context.js
@@ -23,7 +23,7 @@
 var { Ci, Cu, Cr, Cc } = require("chrome");
 var Services = require("Services");
 const ChromeUtils = require("ChromeUtils");
-var { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
+var { ActorRegistry } = require("devtools/server/actor-registry");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var { assert } = DevToolsUtils;
 var { TabSources } = require("devtools/server/actors/utils/TabSources");
diff --git a/devtools/server/actors/utils/actor-registry-utils.js b/devtools/server/actors/utils/actor-registry-utils.js
index a4cfac1a8a5e..374ece10abe7 100644
--- a/devtools/server/actors/utils/actor-registry-utils.js
+++ b/devtools/server/actors/utils/actor-registry-utils.js
@@ -7,7 +7,7 @@
 const { Cu, CC } = require("chrome");
 
 const { DebuggerServer } = require("devtools/server/main");
-const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
+const { ActorRegistry } = require("devtools/server/actor-registry");
 
 /**
  * Support for actor registration. Main used by ActorRegistryActor
diff --git a/devtools/server/actors/utils/moz.build b/devtools/server/actors/utils/moz.build
index 3d41705addde..536575e65515 100644
--- a/devtools/server/actors/utils/moz.build
+++ b/devtools/server/actors/utils/moz.build
@@ -6,7 +6,6 @@
 
 DevToolsModules(
     'actor-registry-utils.js',
-    'actor-registry.js',
     'audionodes.json',
     'automation-timeline.js',
     'breakpoint-actor-map.js',
diff --git a/devtools/server/actors/webbrowser.js b/devtools/server/actors/webbrowser.js
index 753d404d2f81..2793b4e3bdd7 100644
--- a/devtools/server/actors/webbrowser.js
+++ b/devtools/server/actors/webbrowser.js
@@ -9,7 +9,7 @@
 var { Ci } = require("chrome");
 var Services = require("Services");
 var { DebuggerServer } = require("devtools/server/main");
-var { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
+var { ActorRegistry } = require("devtools/server/actor-registry");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 
 loader.lazyRequireGetter(this, "RootActor", "devtools/server/actors/root", true);
diff --git a/devtools/server/main.js b/devtools/server/main.js
index 9c2b54e1ab12..0e5a9ccc7ac4 100644
--- a/devtools/server/main.js
+++ b/devtools/server/main.js
@@ -11,7 +11,7 @@
 var { Ci, Cc } = require("chrome");
 var Services = require("Services");
 var { Pool } = require("devtools/shared/protocol");
-var { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
+var { ActorRegistry } = require("devtools/server/actor-registry");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var { dumpn } = DevToolsUtils;
 
diff --git a/devtools/server/moz.build b/devtools/server/moz.build
index 0fd01f92a722..694472774174 100644
--- a/devtools/server/moz.build
+++ b/devtools/server/moz.build
@@ -20,6 +20,7 @@ MOCHITEST_CHROME_MANIFESTS += ['tests/mochitest/chrome.ini']
 XPCSHELL_TESTS_MANIFESTS += ['tests/unit/xpcshell.ini']
 
 DevToolsModules(
+    'actor-registry.js',
     'main.js',
 )
 
diff --git a/devtools/server/tests/browser/head.js b/devtools/server/tests/browser/head.js
index 5495cc8db84b..69bdb4760eb4 100644
--- a/devtools/server/tests/browser/head.js
+++ b/devtools/server/tests/browser/head.js
@@ -12,7 +12,7 @@ Services.scriptloader.loadSubScript(
   this);
 
 const {DebuggerClient} = require("devtools/shared/client/debugger-client");
-const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
+const { ActorRegistry } = require("devtools/server/actor-registry");
 const {DebuggerServer} = require("devtools/server/main");
 
 const PATH = "browser/devtools/server/tests/browser/";
diff --git a/devtools/server/tests/mochitest/test_connectToFrame.html b/devtools/server/tests/mochitest/test_connectToFrame.html
index 91000476f13f..cd775e91d61c 100644
--- a/devtools/server/tests/mochitest/test_connectToFrame.html
+++ b/devtools/server/tests/mochitest/test_connectToFrame.html
@@ -47,7 +47,7 @@ function runTests() {
     /* eslint-disable no-shadow */
     const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
     const { DebuggerServer } = require("devtools/server/main");
-    const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
+    const { ActorRegistry } = require("devtools/server/actor-registry");
     /* eslint-enable no-shadow */
 
     DebuggerServer.init();
diff --git a/devtools/server/tests/unit/head_dbg.js b/devtools/server/tests/unit/head_dbg.js
index e216f1ec2d9d..6a792baa8f8f 100644
--- a/devtools/server/tests/unit/head_dbg.js
+++ b/devtools/server/tests/unit/head_dbg.js
@@ -31,7 +31,7 @@ Services.prefs.setBoolPref("devtools.debugger.log", true);
 Services.prefs.setBoolPref("devtools.debugger.remote-enabled", true);
 
 const DevToolsUtils = require("devtools/shared/DevToolsUtils");
-const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
+const { ActorRegistry } = require("devtools/server/actor-registry");
 const { DebuggerServer } = require("devtools/server/main");
 const { DebuggerServer: WorkerDebuggerServer } = worker.require("devtools/server/main");
 const { DebuggerClient } = require("devtools/shared/client/debugger-client");
diff --git a/devtools/server/tests/unit/testactors.js b/devtools/server/tests/unit/testactors.js
index 3a68921e531f..aca29c351459 100644
--- a/devtools/server/tests/unit/testactors.js
+++ b/devtools/server/tests/unit/testactors.js
@@ -7,7 +7,7 @@ const { LazyPool, createExtraActors } = require("devtools/shared/protocol/lazy-p
 const { RootActor } = require("devtools/server/actors/root");
 const { ThreadActor } = require("devtools/server/actors/thread");
 const { DebuggerServer } = require("devtools/server/main");
-const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
+const { ActorRegistry } = require("devtools/server/actor-registry");
 const { TabSources } = require("devtools/server/actors/utils/TabSources");
 const makeDebugger = require("devtools/server/actors/utils/make-debugger");
 
diff --git a/devtools/shared/security/tests/unit/testactors.js b/devtools/shared/security/tests/unit/testactors.js
index 24b9935191e7..0b2c47d52af6 100644
--- a/devtools/shared/security/tests/unit/testactors.js
+++ b/devtools/shared/security/tests/unit/testactors.js
@@ -6,7 +6,7 @@ const { LazyPool, createExtraActors } = require("devtools/shared/protocol/lazy-p
 const { RootActor } = require("devtools/server/actors/root");
 const { ThreadActor } = require("devtools/server/actors/thread");
 const { DebuggerServer } = require("devtools/server/main");
-const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
+const { ActorRegistry } = require("devtools/server/actor-registry");
 const promise = require("promise");
 
 var gTestGlobals = [];
diff --git a/devtools/shared/transport/tests/unit/head_dbg.js b/devtools/shared/transport/tests/unit/head_dbg.js
index a4da3fbf3109..ad76dbf97810 100644
--- a/devtools/shared/transport/tests/unit/head_dbg.js
+++ b/devtools/shared/transport/tests/unit/head_dbg.js
@@ -25,7 +25,7 @@ const Services = require("Services");
 // Enable remote debugging for the relevant tests.
 Services.prefs.setBoolPref("devtools.debugger.remote-enabled", true);
 
-const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
+const { ActorRegistry } = require("devtools/server/actor-registry");
 const { DebuggerServer } = require("devtools/server/main");
 const { DebuggerClient } = require("devtools/shared/client/debugger-client");
 
diff --git a/devtools/shared/transport/tests/unit/testactors-no-bulk.js b/devtools/shared/transport/tests/unit/testactors-no-bulk.js
index 1fe4fc40d6ed..fee723974c8b 100644
--- a/devtools/shared/transport/tests/unit/testactors-no-bulk.js
+++ b/devtools/shared/transport/tests/unit/testactors-no-bulk.js
@@ -3,7 +3,7 @@
 "use strict";
 
 const { RootActor } = require("devtools/server/actors/root");
-const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
+const { ActorRegistry } = require("devtools/server/actor-registry");
 
 /**
  * Root actor that doesn't have the bulk trait.
diff --git a/devtools/shared/transport/tests/unit/testactors.js b/devtools/shared/transport/tests/unit/testactors.js
index 9bab6c48b6b0..3b34c5d18694 100644
--- a/devtools/shared/transport/tests/unit/testactors.js
+++ b/devtools/shared/transport/tests/unit/testactors.js
@@ -6,7 +6,7 @@ const { LazyPool, createExtraActors } = require("devtools/shared/protocol/lazy-p
 const { RootActor } = require("devtools/server/actors/root");
 const { ThreadActor } = require("devtools/server/actors/thread");
 const { DebuggerServer } = require("devtools/server/main");
-const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
+const { ActorRegistry } = require("devtools/server/actor-registry");
 
 var gTestGlobals = [];
 DebuggerServer.addTestGlobal = function(global) {
diff --git a/testing/talos/talos/tests/devtools/addon/content/tests/server/protocol.js b/testing/talos/talos/tests/devtools/addon/content/tests/server/protocol.js
index ad61d51294f6..b7e0e40f1df9 100644
--- a/testing/talos/talos/tests/devtools/addon/content/tests/server/protocol.js
+++ b/testing/talos/talos/tests/devtools/addon/content/tests/server/protocol.js
@@ -34,7 +34,7 @@ module.exports = async function() {
     `function () {
       const { require } = ChromeUtils.import("resource://devtools/shared/Loader.jsm", {});
 
-      const { ActorRegistry } = require("devtools/server/actors/utils/actor-registry");
+      const { ActorRegistry } = require("devtools/server/actor-registry");
       ActorRegistry.registerModule("chrome://damp/content/tests/server/actor.js", {
         prefix: "dampTest",
         constructor: "DampTestActor",