Bug 1474980 - Stop exporting ActorPool/OriginalLocation from server/main.js. r=jryans

MozReview-Commit-ID: Gsef6U1g46r

--HG--
extra : rebase_source : 88211a36264a8f0191b0c8d2a22f3abf4df92183

devtools/server/actors/targets/content-process.js

@@ -17,7 +17,7 @@ const Services = require("Services");
 const { ChromeDebuggerActor } = require("devtools/server/actors/thread");
 const { WebConsoleActor } = require("devtools/server/actors/webconsole");
 const makeDebugger = require("devtools/server/actors/utils/make-debugger");
-const { ActorPool } = require("devtools/server/main");
+const { ActorPool } = require("devtools/server/actors/common");
 const { assert } = require("devtools/shared/DevToolsUtils");
 const { TabSources } = require("devtools/server/actors/utils/TabSources");
 

devtools/server/actors/webconsole.js

@@ -10,7 +10,8 @@
 
 const Services = require("Services");
 const { Cc, Ci, Cu } = require("chrome");
-const { DebuggerServer, ActorPool } = require("devtools/server/main");
+const { DebuggerServer } = require("devtools/server/main");
+const { ActorPool } = require("devtools/server/actors/common");
 const { ThreadActor } = require("devtools/server/actors/thread");
 const { ObjectActor } = require("devtools/server/actors/object");
 const { LongStringActor } = require("devtools/server/actors/object/long-string");

devtools/server/main.js

@@ -10,7 +10,7 @@
  */
 var { Ci, Cc } = require("chrome");
 var Services = require("Services");
-var { ActorPool, OriginalLocation, RegisteredActorFactory,
+var { ActorPool, RegisteredActorFactory,
       ObservedActorFactory } = require("devtools/server/actors/common");
 var DevToolsUtils = require("devtools/shared/DevToolsUtils");
 var { dumpn } = DevToolsUtils;
@@ -1299,16 +1299,7 @@ DevToolsUtils.defineLazyGetter(DebuggerServer, "AuthenticationResult", () => {
 
 EventEmitter.decorate(DebuggerServer);
 
-if (this.exports) {
-  exports.DebuggerServer = DebuggerServer;
-  exports.ActorPool = ActorPool;
-  exports.OriginalLocation = OriginalLocation;
-}
-
-// Needed on B2G (See header note)
-this.DebuggerServer = DebuggerServer;
-this.ActorPool = ActorPool;
-this.OriginalLocation = OriginalLocation;
+exports.DebuggerServer = DebuggerServer;
 
 /**
  * Creates a DebuggerServerConnection.

devtools/server/startup/content-process.jsm

@@ -78,7 +78,7 @@ function init(msg) {
 
     const { ContentProcessTargetActor } =
         loader.require("devtools/server/actors/targets/content-process");
-    const { ActorPool } = loader.require("devtools/server/main");
+    const { ActorPool } = loader.require("devtools/server/actors/common");
     const actor = new ContentProcessTargetActor(conn);
     const actorPool = new ActorPool(conn);
     actorPool.addActor(actor);