mozilla-central: changeset 161102:34e88cb414cd346e32c81f062cc993aa7a308df6

author	Paul Rouget <paul@mozilla.com>
	Wed, 18 Dec 2013 13:18:25 -0500
changeset 161102	34e88cb414cd346e32c81f062cc993aa7a308df6
parent 161101	bdceb89107dbdfbe48dd3bf78158fb028cdf1dd8
child 161103	7454e1c000672b315c5a6d07312535691e1092dd
push id	25867
push user	ryanvm@gmail.com
push date	Thu, 19 Dec 2013 02:19:33 +0000
treeherder	mozilla-central@04a70c8908de [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	ochameau
bugs	951609
milestone	29.0a1
first release with	nightly linux32 5c7fa2bfea8b / 29.0a1 / 20131219030202 / files nightly linux64 5c7fa2bfea8b / 29.0a1 / 20131219030202 / files nightly mac 5c7fa2bfea8b / 29.0a1 / 20131219030202 / files nightly win32 5c7fa2bfea8b / 29.0a1 / 20131219030202 / files nightly win64 5c7fa2bfea8b / 29.0a1 / 20131219030202 / files
last release without	nightly linux32 862cb6a1cc88 / 29.0a1 / 20131218030217 / files nightly linux64 862cb6a1cc88 / 29.0a1 / 20131218030217 / files nightly mac 862cb6a1cc88 / 29.0a1 / 20131218030217 / files nightly win32 862cb6a1cc88 / 29.0a1 / 20131218030217 / files nightly win64 862cb6a1cc88 / 29.0a1 / 20131218030217 / files

--- a/toolkit/devtools/server/child.js
+++ b/toolkit/devtools/server/child.js
@@ -1,11 +1,10 @@
-Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/devtools/dbg-server.jsm");
-Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm");
+const {DevToolsUtils} = Cu.import("resource://gre/modules/devtools/DevToolsUtils.jsm", {});
+const {DebuggerServer, ActorPool} = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {});
 
 if (!DebuggerServer.initialized) {
   DebuggerServer.init();
 }
 
 // In case of apps being loaded in parent process, DebuggerServer is already
 // initialized, but child specific actors are not registered.
 // Otherwise, for apps in child process, we need to load actors the first