Yet more fixes for module paths (bug 912121)

Author: janodvarko

lib/har-driver-actor.js

@@ -19,9 +19,9 @@ Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 // See also: https://bugzilla.mozilla.org/show_bug.cgi?id=912121
 var devtools;
 try {
-  devtools = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {});
+  devtools = Cu.import("resource://gre/modules/devtools/shared/Loader.jsm", {}).devtools;
 } catch (err) {
-  devtools = Cu.import("resource://gre/modules/devtools/Loader.jsm", {});
+  devtools = Cu.import("resource://gre/modules/devtools/Loader.jsm", {}).devtools;
 }
 
 var DevToolsUtils;
@@ -31,7 +31,7 @@ try {
   DevToolsUtils = devtools["require"]("devtools/toolkit/DevToolsUtils");
 }
 
-const { DebuggerServer } = Cu.import("resource://gre/modules/devtools/dbg-server.jsm", {});
+const { DebuggerServer } = devtools["require"]("devtools/server/main");
 const protocol = devtools["require"]("devtools/server/protocol");
 const { method, RetVal, ActorClass, Actor, Arg, types } = protocol;