Bug 1192863 - Use client/main.js instead of dbg-server.jsm. r=jryans

addon-sdk/source/test/addons/page-mod-debugger-post/main.js

@@ -14,7 +14,7 @@ const { set } = require('sdk/preferences/service');
 
 const { require: devtoolsRequire } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 const { DebuggerServer } = devtoolsRequire("devtools/server/main");
-const { DebuggerClient } = Cu.import('resource://gre/modules/devtools/dbg-client.jsm', {});
+const { DebuggerClient } = devtoolsRequire("devtools/toolkit/client/main");
 
 let gClient;
 let ok;

addon-sdk/source/test/addons/page-mod-debugger-pre/main.js

@@ -14,7 +14,7 @@ const { set } = require('sdk/preferences/service');
 
 const { require: devtoolsRequire } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 const { DebuggerServer } = devtoolsRequire("devtools/server/main");
-const { DebuggerClient } = Cu.import('resource://gre/modules/devtools/dbg-client.jsm', {});
+const { DebuggerClient } = devtoolsRequire("devtools/toolkit/client/main");
 
 let gClient;
 let ok;

b2g/chrome/content/devtools/hud.js

@@ -14,7 +14,7 @@ XPCOMUtils.defineLazyGetter(this, 'devtools', function() {
 });
 
 XPCOMUtils.defineLazyGetter(this, 'DebuggerClient', function() {
-  return Cu.import('resource://gre/modules/devtools/dbg-client.jsm', {}).DebuggerClient;
+  return devtools.require('devtools/toolkit/client/main').DebuggerClient;
 });
 
 XPCOMUtils.defineLazyGetter(this, 'WebConsoleUtils', function() {

browser/devtools/app-manager/content/device.js

@@ -4,7 +4,6 @@
 
 const Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
 const {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 
 const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});

browser/devtools/app-manager/webapps-store.js

@@ -7,7 +7,6 @@ const promise = require("devtools/toolkit/deprecated-sync-thenables");
 const {Connection} = require("devtools/client/connection-manager");
 
 const {Cu} = require("chrome");
-const dbgClient = Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
 const _knownWebappsStores = new WeakMap();
 
 let WebappsStore;

browser/devtools/canvasdebugger/test/head.js

@@ -16,8 +16,8 @@ let { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
 let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
 let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 let { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-let { DebuggerClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {});
 
+let { DebuggerClient } = require("devtools/toolkit/client/main");
 let { DebuggerServer } = require("devtools/server/main");
 let { CallWatcherFront } = require("devtools/server/actors/call-watcher");
 let { CanvasFront } = require("devtools/server/actors/canvas");

browser/devtools/debugger/test/head.js

@@ -19,8 +19,7 @@ let { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 let { BrowserToolboxProcess } = Cu.import("resource:///modules/devtools/ToolboxProcess.jsm", {});
 let { DebuggerServer } = require("devtools/server/main");
-let { DebuggerClient, ObjectClient } =
-  Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {});
+let { DebuggerClient, ObjectClient } = require("devtools/toolkit/client/main");
 let { AddonManager } = Cu.import("resource://gre/modules/AddonManager.jsm", {});
 let EventEmitter = require("devtools/toolkit/event-emitter");
 const { promiseInvoke } = require("devtools/async-utils");

browser/devtools/framework/connect/connect.js

@@ -10,12 +10,12 @@ const Cu = Components.utils;
 Cu.import('resource://gre/modules/XPCOMUtils.jsm');
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/Task.jsm");
-Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
 let {gDevTools} = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 let {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let {TargetFactory} = require("devtools/framework/target");
 let {Toolbox} = require("devtools/framework/toolbox")
 let {Promise: promise} = Cu.import("resource://gre/modules/Promise.jsm", {});
+let {DebuggerClient} = require("devtools/toolkit/client/main");
 
 let gClient;
 let gConnectionTimeout;

browser/devtools/framework/gDevTools.jsm

@@ -21,9 +21,8 @@ XPCOMUtils.defineLazyModuleGetter(this, "console",
                                   "resource://gre/modules/devtools/Console.jsm");
 XPCOMUtils.defineLazyModuleGetter(this, "CustomizableUI",
                                   "resource:///modules/CustomizableUI.jsm");
-XPCOMUtils.defineLazyModuleGetter(this, "DebuggerClient",
-                                  "resource://gre/modules/devtools/dbg-client.jsm");
 loader.lazyRequireGetter(this, "DebuggerServer", "devtools/server/main", true);
+loader.lazyRequireGetter(this, "DebuggerClient", "devtools/toolkit/client/main", true);
 
 const DefaultTools = require("definitions").defaultTools;
 const EventEmitter = require("devtools/toolkit/event-emitter");

browser/devtools/framework/target.js

@@ -10,8 +10,7 @@ const EventEmitter = require("devtools/toolkit/event-emitter");
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 loader.lazyRequireGetter(this, "DebuggerServer", "devtools/server/main", true);
-XPCOMUtils.defineLazyModuleGetter(this, "DebuggerClient",
-  "resource://gre/modules/devtools/dbg-client.jsm");
+loader.lazyRequireGetter(this, "DebuggerClient", "devtools/toolkit/client/main", true);
 
 const targets = new WeakMap();
 const promiseTargets = new WeakMap();

browser/devtools/framework/test/browser_toolbox_tool_remote_reopen.js

@@ -9,8 +9,7 @@
 thisTestLeaksUncaughtRejectionsAndShouldBeFixed("Error: Shader Editor is still waiting for a WebGL context to be created.");
 
 const { DebuggerServer } = require("devtools/server/main");
-const { DebuggerClient } =
-  Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {});
+const { DebuggerClient } = require("devtools/toolkit/client/main");
 
 /**
  * Bug 979536: Ensure fronts are destroyed after toolbox close.

browser/devtools/framework/test/browser_toolbox_transport_events.js

@@ -2,7 +2,7 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 const { on, off } = require("sdk/event/core");
-const { DebuggerClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {});
+const { DebuggerClient } = require("devtools/toolkit/client/main");
 
 function test() {
   gDevTools.on("toolbox-created", onToolboxCreated);

browser/devtools/framework/test/browser_two_tabs.js

@@ -6,8 +6,7 @@
  */
 
 let { DebuggerServer } = require("devtools/server/main");
-let { DebuggerClient } =
-  Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {});
+let { DebuggerClient } = require("devtools/toolkit/client/main");
 
 const TAB_URL_1 = "data:text/html;charset=utf-8,foo";
 const TAB_URL_2 = "data:text/html;charset=utf-8,bar";

browser/devtools/framework/test/head.js

@@ -20,7 +20,7 @@ function toggleAllTools(state) {
 function getChromeActors(callback)
 {
   let { DebuggerServer } = require("devtools/server/main");
-  let { DebuggerClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {});
+  let { DebuggerClient } = require("devtools/toolkit/client/main");
 
   if (!DebuggerServer.initialized) {
     DebuggerServer.init();

browser/devtools/framework/toolbox-process-window.js

@@ -10,8 +10,7 @@ let { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let { TargetFactory } = require("devtools/framework/target");
 let { Toolbox } = require("devtools/framework/toolbox");
 let { Services } = Cu.import("resource://gre/modules/Services.jsm", {});
-let { DebuggerClient } =
-  Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {});
+let { DebuggerClient } = require("devtools/toolkit/client/main");
 let { ViewHelpers } =
   Cu.import("resource:///modules/devtools/ViewHelpers.jsm", {});
 let { Task } = Cu.import("resource://gre/modules/Task.jsm", {});

browser/devtools/scratchpad/scratchpad.js

@@ -69,16 +69,11 @@ XPCOMUtils.defineLazyModuleGetter(this, "VariablesView",
 XPCOMUtils.defineLazyModuleGetter(this, "VariablesViewController",
   "resource:///modules/devtools/VariablesViewController.jsm");
 
-XPCOMUtils.defineLazyModuleGetter(this, "EnvironmentClient",
-  "resource://gre/modules/devtools/dbg-client.jsm");
-
-XPCOMUtils.defineLazyModuleGetter(this, "ObjectClient",
-  "resource://gre/modules/devtools/dbg-client.jsm");
-
 loader.lazyRequireGetter(this, "DebuggerServer", "devtools/server/main", true);
 
-XPCOMUtils.defineLazyModuleGetter(this, "DebuggerClient",
-  "resource://gre/modules/devtools/dbg-client.jsm");
+loader.lazyRequireGetter(this, "DebuggerClient", "devtools/toolkit/client/main", true);
+loader.lazyRequireGetter(this, "EnvironmentClient", "devtools/toolkit/client/main", true);
+loader.lazyRequireGetter(this, "ObjectClient", "devtools/toolkit/client/main", true);
 
 XPCOMUtils.defineLazyGetter(this, "REMOTE_TIMEOUT", () =>
   Services.prefs.getIntPref("devtools.debugger.remote-timeout"));

browser/devtools/shadereditor/test/head.js

@@ -14,8 +14,8 @@ let { Task } = Cu.import("resource://gre/modules/Task.jsm", {});
 let { Promise: promise } = Cu.import("resource://gre/modules/Promise.jsm", {});
 let { gDevTools } = Cu.import("resource:///modules/devtools/gDevTools.jsm", {});
 let { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-let { DebuggerClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {});
 
+let { DebuggerClient } = require("devtools/toolkit/client/main");
 let { DebuggerServer } = require("devtools/server/main");
 let { WebGLFront } = require("devtools/server/actors/webgl");
 let DevToolsUtils = require("devtools/toolkit/DevToolsUtils");

browser/devtools/webconsole/console-output.js

@@ -14,10 +14,10 @@ loader.lazyImporter(this, "escapeHTML", "resource:///modules/devtools/VariablesV
 loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm");
 loader.lazyImporter(this, "Task", "resource://gre/modules/Task.jsm");
 loader.lazyImporter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm");
-loader.lazyImporter(this, "ObjectClient", "resource://gre/modules/devtools/dbg-client.jsm");
 
 loader.lazyRequireGetter(this, "promise");
 loader.lazyRequireGetter(this, "TableWidget", "devtools/shared/widgets/TableWidget", true);
+loader.lazyRequireGetter(this, "ObjectClient", "devtools/toolkit/client/main", true);
 
 const Heritage = require("sdk/core/heritage");
 const URI = Cc["@mozilla.org/network/io-service;1"].getService(Ci.nsIIOService);

browser/devtools/webconsole/hudservice.js

@@ -19,7 +19,7 @@ loader.lazyImporter(this, "promise", "resource://gre/modules/Promise.jsm", "Prom
 loader.lazyImporter(this, "gDevTools", "resource:///modules/devtools/gDevTools.jsm");
 loader.lazyImporter(this, "Services", "resource://gre/modules/Services.jsm");
 loader.lazyRequireGetter(this, "DebuggerServer", "devtools/server/main", true);
-loader.lazyImporter(this, "DebuggerClient", "resource://gre/modules/devtools/dbg-client.jsm");
+loader.lazyRequireGetter(this, "DebuggerClient", "devtools/toolkit/client/main", true);
 loader.lazyGetter(this, "showDoorhanger", () => require("devtools/shared/doorhanger").showDoorhanger);
 loader.lazyRequireGetter(this, "sourceUtils", "devtools/shared/source-utils");
 

browser/devtools/webconsole/webconsole.js

@@ -28,8 +28,8 @@ loader.lazyGetter(this, "Messages",
                   () => require("devtools/webconsole/console-output").Messages);
 loader.lazyGetter(this, "asyncStorage",
                   () => require("devtools/toolkit/shared/async-storage"));
-loader.lazyImporter(this, "EnvironmentClient", "resource://gre/modules/devtools/dbg-client.jsm");
-loader.lazyImporter(this, "ObjectClient", "resource://gre/modules/devtools/dbg-client.jsm");
+loader.lazyRequireGetter(this, "EnvironmentClient", "devtools/toolkit/client/main", true);
+loader.lazyRequireGetter(this, "ObjectClient", "devtools/toolkit/client/main", true);
 loader.lazyImporter(this, "VariablesView", "resource:///modules/devtools/VariablesView.jsm");
 loader.lazyImporter(this, "VariablesViewController", "resource:///modules/devtools/VariablesViewController.jsm");
 loader.lazyImporter(this, "PluralForm", "resource://gre/modules/PluralForm.jsm");

toolkit/devtools/apps/tests/debugger-protocol-helper.js

@@ -5,8 +5,8 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
-const { DebuggerClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
 const { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const { DebuggerClient } = require("devtools/toolkit/client/main");
 const { DebuggerServer } = require("devtools/server/main");
 const { FileUtils } = Cu.import("resource://gre/modules/FileUtils.jsm");
 const { Services } = Cu.import("resource://gre/modules/Services.jsm");

toolkit/devtools/apps/tests/unit/head_apps.js

@@ -7,12 +7,11 @@ const Cu = Components.utils;
 const Cr = Components.results;
 const CC = Components.Constructor;
 
-Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
-
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");
 const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const {DebuggerClient} = require("devtools/toolkit/client/main");
 const {DebuggerServer} = require("devtools/server/main");
 const {AppActorFront} = require("devtools/app-actor-front");
 

toolkit/devtools/client/connection-manager.js

@@ -11,9 +11,9 @@ const {setTimeout, clearTimeout} = require('sdk/timers');
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 const { DebuggerServer } = require("devtools/server/main");
+const { DebuggerClient } = require("devtools/toolkit/client/main");
 
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
 DevToolsUtils.defineLazyModuleGetter(this, "Task",
   "resource://gre/modules/Task.jsm");
 

toolkit/devtools/security/tests/unit/head_dbg.js

@@ -18,6 +18,7 @@ const Services = require("Services");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils.js");
 const xpcInspector = require("xpcInspector");
 const { DebuggerServer } = require("devtools/server/main");
+const { DebuggerClient } = require("devtools/toolkit/client/main");
 
 // We do not want to log packets by default, because in some tests,
 // we can be sending large amounts of data. The test harness has
@@ -30,18 +31,6 @@ Services.prefs.setBoolPref("devtools.debugger.remote-enabled", true);
 // Fast timeout for TLS tests
 Services.prefs.setIntPref("devtools.remote.tls-handshake-timeout", 1000);
 
-function tryImport(url) {
-  try {
-    Cu.import(url);
-  } catch (e) {
-    dump("Error importing " + url + "\n");
-    dump(DevToolsUtils.safeErrorString(e) + "\n");
-    throw e;
-  }
-}
-
-tryImport("resource://gre/modules/devtools/dbg-client.jsm");
-
 // Convert an nsIScriptError 'aFlags' value into an appropriate string.
 function scriptErrorFlagsToKind(aFlags) {
   var kind;

toolkit/devtools/server/tests/browser/head.js

@@ -9,7 +9,7 @@ const Cu = Components.utils;
 Cu.import("resource://gre/modules/Services.jsm");
 const {console} = Cu.import("resource://gre/modules/devtools/Console.jsm", {});
 const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-const {DebuggerClient} = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {});
+const {DebuggerClient} = require("devtools/toolkit/client/main");
 const {DebuggerServer} = require("devtools/server/main");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 

toolkit/devtools/server/tests/mochitest/director-helpers.js

@@ -1,6 +1,6 @@
 var Cu = Components.utils;
-Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
 const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+const {DebuggerClient} = require("devtools/toolkit/client/main");
 const {DebuggerServer} = require("devtools/server/main");
 const Services = require("Services");
 

toolkit/devtools/server/tests/mochitest/inspector-helpers.js

@@ -1,7 +1,7 @@
 var Cu = Components.utils;
 
 const {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+const {DebuggerClient} = require("devtools/toolkit/client/main");
 const {DebuggerServer} = require("devtools/server/main");
 Cu.import("resource://gre/modules/Task.jsm");
 

toolkit/devtools/server/tests/mochitest/memory-helpers.js

@@ -10,10 +10,9 @@ SimpleTest.registerCleanupFunction(function() {
   Services.prefs.clearUserPref("devtools.debugger.log");
 });
 
-Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
-
 Cu.import("resource://gre/modules/Task.jsm");
 let { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+let { DebuggerClient } = require("devtools/toolkit/client/main");
 let { DebuggerServer } = require("devtools/server/main");
 
 let { MemoryFront } = require("devtools/server/actors/memory");

toolkit/devtools/server/tests/mochitest/test_connectToChild.html

@@ -17,8 +17,8 @@ let Cu = Components.utils;
 let Cc = Components.classes;
 let Ci = Components.interfaces;
 
-Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
 let { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm");
+let { DebuggerClient } = require("devtools/toolkit/client/main");
 let { DebuggerServer } = require("devtools/server/main");
 
 window.onload = function() {

toolkit/devtools/server/tests/mochitest/test_device.html

@@ -20,7 +20,7 @@ window.onload = function() {
 
   Cu.import("resource://gre/modules/PermissionsTable.jsm");
   var {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-  Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+  var {DebuggerClient} = require("devtools/toolkit/client/main");
   var {DebuggerServer} = require("devtools/server/main");
   Cu.import("resource://gre/modules/Services.jsm");
 

toolkit/devtools/server/tests/mochitest/test_framerate_01.html

@@ -27,7 +27,7 @@ window.onload = function() {
   });
 
   var { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-  Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+  var { DebuggerClient } = require("devtools/toolkit/client/main");
   var { DebuggerServer } = require("devtools/server/main");
 
   SimpleTest.waitForExplicitFinish();

toolkit/devtools/server/tests/mochitest/test_framerate_02.html

@@ -27,7 +27,7 @@ window.onload = function() {
   });
 
   var {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-  Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+  var {DebuggerClient} = require("devtools/toolkit/client/main");
   var {DebuggerServer} = require("devtools/server/main");
 
   SimpleTest.waitForExplicitFinish();

toolkit/devtools/server/tests/mochitest/test_framerate_03.html

@@ -27,7 +27,7 @@ window.onload = function() {
   });
 
   var {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-  Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+  var {DebuggerClient} = require("devtools/toolkit/client/main");
   var {DebuggerServer} = require("devtools/server/main");
 
   SimpleTest.waitForExplicitFinish();

toolkit/devtools/server/tests/mochitest/test_framerate_05.html

@@ -27,7 +27,7 @@ window.onload = function() {
   });
 
   var {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-  Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+  var {DebuggerClient} = require("devtools/toolkit/client/main");
   var {DebuggerServer} = require("devtools/server/main");
 
   SimpleTest.waitForExplicitFinish();

toolkit/devtools/server/tests/mochitest/test_getProcess.html

@@ -18,7 +18,7 @@ let Cc = Components.classes;
 let Ci = Components.interfaces;
 
 let {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+let {DebuggerClient} = require("devtools/toolkit/client/main");
 let {DebuggerServer} = require("devtools/server/main");
 
 window.onload = function() {

toolkit/devtools/server/tests/mochitest/test_preference.html

@@ -19,7 +19,7 @@ function runTests() {
   var Ci = Components.interfaces;
 
   var {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-  Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+  var {DebuggerClient} = require("devtools/toolkit/client/main");
   var {DebuggerServer} = require("devtools/server/main");
   Cu.import("resource://gre/modules/Services.jsm");
 

toolkit/devtools/server/tests/mochitest/test_registerActor.html

@@ -19,7 +19,7 @@ window.onload = function() {
   var Ci = Components.interfaces;
 
   var {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-  Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+  var {DebuggerClient} = require("devtools/toolkit/client/main");
   var {DebuggerServer} = require("devtools/server/main");
   Cu.import("resource://gre/modules/Services.jsm");
 

toolkit/devtools/server/tests/mochitest/test_settings.html

@@ -20,7 +20,7 @@ function runTests() {
   var Ci = Components.interfaces;
 
   var {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-  Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+  var {DebuggerClient} = require("devtools/toolkit/client/main");
   var {DebuggerServer} = require("devtools/server/main");
 
   if (SpecialPowers.isMainProcess()) {

toolkit/devtools/server/tests/mochitest/test_setupInParentChild.html

@@ -19,7 +19,7 @@ let Ci = Components.interfaces;
 
 Cu.import("resource://gre/modules/Services.jsm");
 let {require} = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
-Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+let {DebuggerClient} = require("devtools/toolkit/client/main");
 let {DebuggerServer} = require("devtools/server/main");
 
 window.onload = function() {

toolkit/devtools/server/tests/unit/head_dbg.js

@@ -24,6 +24,7 @@ Services.prefs.setBoolPref("devtools.debugger.remote-enabled", true);
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils.js");
 const { DebuggerServer } = require("devtools/server/main");
 const { DebuggerServer: WorkerDebuggerServer } = worker.require("devtools/server/main");
+const { DebuggerClient, ObjectClient } = require("devtools/toolkit/client/main");
 
 let loadSubScript = Cc[
   '@mozilla.org/moz/jssubscript-loader;1'
@@ -131,7 +132,6 @@ function tryImport(url) {
   }
 }
 
-tryImport("resource://gre/modules/devtools/dbg-client.jsm");
 tryImport("resource://gre/modules/devtools/Loader.jsm");
 tryImport("resource://gre/modules/devtools/Console.jsm");
 

toolkit/devtools/transport/tests/unit/head_dbg.js

@@ -27,7 +27,7 @@ const DevToolsUtils = require("devtools/toolkit/DevToolsUtils.js");
 Services.prefs.setBoolPref("devtools.debugger.remote-enabled", true);
 
 const { DebuggerServer } = require("devtools/server/main");
-Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
+const { DebuggerClient } = require("devtools/toolkit/client/main");
 
 function testExceptionHook(ex) {
   try {

toolkit/devtools/webconsole/client.js

@@ -10,8 +10,7 @@ const {Cc, Ci, Cu} = require("chrome");
 const DevToolsUtils = require("devtools/toolkit/DevToolsUtils");
 const EventEmitter = require("devtools/toolkit/event-emitter");
 const promise = require("promise");
-
-loader.lazyImporter(this, "LongStringClient", "resource://gre/modules/devtools/dbg-client.jsm");
+const {LongStringClient} = require("devtools/toolkit/client/main");
 
 /**
  * A WebConsoleClient is used as a front end for the WebConsoleActor that is

toolkit/devtools/webconsole/test/common.js

@@ -19,6 +19,7 @@ let WebConsoleUtils = require("devtools/toolkit/webconsole/utils").Utils;
 let ConsoleAPIStorage = Cc["@mozilla.org/consoleAPI-storage;1"]
                           .getService(Ci.nsIConsoleAPIStorage);
 let {DebuggerServer} = require("devtools/server/main");
+let {DebuggerClient, ObjectClient} = require("devtools/toolkit/client/main");
 
 let {ConsoleServiceListener, ConsoleAPIListener} =
   require("devtools/toolkit/webconsole/utils");
@@ -26,8 +27,6 @@ let {ConsoleServiceListener, ConsoleAPIListener} =
 function initCommon()
 {
   //Services.prefs.setBoolPref("devtools.debugger.log", true);
-
-  Cu.import("resource://gre/modules/devtools/dbg-client.jsm");
 }
 
 function initDebuggerServer()

webapprt/test/chrome/browser_debugger.js

@@ -1,7 +1,7 @@
 Cu.import("resource://gre/modules/Services.jsm");
 let { require } = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
 let { DebuggerServer } = require("devtools/server/main");
-let { DebuggerClient } = Cu.import("resource://gre/modules/devtools/dbg-client.jsm", {});
+let { DebuggerClient } = require("devtools/toolkit/client/main");
 let { RemoteDebugger } = Cu.import("resource://webapprt/modules/RemoteDebugger.jsm", {});
 
 function test() {