Fix compatibility with Firefox Nightly

Author: janodvarko

lib/inspector-actor.js

@@ -26,6 +26,17 @@ function safeImport(...args) {
   return {};
 }
 
+function safeRequire(devtools, ...args) {
+  for (var i=0; i<args.length; i++) {
+    try {
+      return devtools["require"](args[i]);
+    }
+    catch (err) {
+    }
+  }
+  return {};
+}
+
 // DevTools
 // See also:
 // - https://bugzilla.mozilla.org/show_bug.cgi?id=912121
@@ -36,8 +47,12 @@ const devtools = safeImport(
   "resource://gre/modules/devtools/Loader.jsm"
 ).devtools;
 
+const protocol = safeRequire(devtools,
+  "devtools/shared/protocol",
+  "devtools/server/protocol"
+);
+
 const { DebuggerServer } = devtools["require"]("devtools/server/main");
-const protocol = devtools["require"]("devtools/server/protocol");
 const { method, RetVal, ActorClass, Actor } = protocol;
 
 // For debugging purposes. Note that the tracing module isn't available

lib/inspector-front.js

@@ -11,8 +11,8 @@ const { Trace/*, TraceError*/ } = require("firebug.sdk/lib/core/trace.js").get(m
 
 // DevTools
 // See also: https://bugzilla.mozilla.org/show_bug.cgi?id=912121
-const { devtools } = require("firebug.sdk/lib/core/devtools.js");
-const { Front, FrontClass } = devtools["require"]("devtools/server/protocol");
+const DevTools = require("firebug.sdk/lib/core/devtools.js");
+const { Front, FrontClass } = DevTools.Protocol;
 
 // RDP Inspector
 const { InspectorActor } = require("./inspector-actor.js");