Bug 1003095 - Refactor main.js to be worker friendly;r=past

toolkit/devtools/server/main.js

@@ -48,7 +48,9 @@ Object.defineProperty(this, "Components", {
 
 const DBG_STRINGS_URI = "chrome://global/locale/devtools/debugger.properties";
 
-const nsFile = CC("@mozilla.org/file/local;1", "nsIFile", "initWithPath");
+DevToolsUtils.defineLazyGetter(this, "nsFile", () => {
+  return CC("@mozilla.org/file/local;1", "nsIFile", "initWithPath");
+});
 
 const LOG_PREF = "devtools.debugger.log";
 const VERBOSE_PREF = "devtools.debugger.log.verbose";
@@ -57,8 +59,6 @@ dumpv.wantVerbose =
   Services.prefs.getPrefType(VERBOSE_PREF) !== Services.prefs.PREF_INVALID &&
   Services.prefs.getBoolPref(VERBOSE_PREF);
 
-Cu.import("resource://gre/modules/devtools/deprecated-sync-thenables.js");
-
 function loadSubScript(aURL)
 {
   try {
@@ -82,15 +82,18 @@ this.resolve = resolve;
 this.reject = reject;
 this.all = all;
 
-Cu.import("resource://gre/modules/devtools/SourceMap.jsm");
-
 // XPCOM constructors
-const ServerSocket = CC("@mozilla.org/network/server-socket;1",
-                        "nsIServerSocket",
-                        "initSpecialConnection");
-const UnixDomainServerSocket = CC("@mozilla.org/network/server-socket;1",
-                                  "nsIServerSocket",
-                                  "initWithFilename");
+DevToolsUtils.defineLazyGetter(this, "ServerSocket", () => {
+  return CC("@mozilla.org/network/server-socket;1",
+            "nsIServerSocket",
+            "initSpecialConnection");
+});
+
+DevToolsUtils.defineLazyGetter(this, "UnixDomainServerSocket", () => {
+  return CC("@mozilla.org/network/server-socket;1",
+            "nsIServerSocket",
+            "initWithFilename");
+});
 
 var gRegisteredModules = Object.create(null);
 

toolkit/devtools/worker-loader.js

@@ -102,7 +102,6 @@ function createModule(id) {
 //
 // TODO: Remove this when the whitelist becomes empty
 let chromeWhitelist = [
-  "devtools/server/main",
   "devtools/toolkit/transport/transport",
   "devtools/toolkit/transport/stream-utils",
   "devtools/toolkit/transport/packets",