Bug 1294686 - stub out mochitest directory for new debugger r=bgrins

devtools/client/debugger/moz.build

@@ -13,4 +13,7 @@ DevToolsModules(
     'panel.js'
 )
 
-BROWSER_CHROME_MANIFESTS += ['test/mochitest/browser.ini']
+BROWSER_CHROME_MANIFESTS += [
+  'new/test/mochitest/browser.ini',
+  'test/mochitest/browser.ini'
+]

devtools/client/debugger/new/test/mochitest/browser.ini

@@ -0,0 +1,5 @@
+[DEFAULT]
+tags = devtools
+subsuite = devtools
+
+[browser_dbg_stub.js]

devtools/client/debugger/new/test/mochitest/browser_dbg_stub.js

@@ -0,0 +1,7 @@
+
+add_task(function*() {
+  ok(true,
+     "This is a stub so that we can run the new debugger tests " +
+     "by copying them in here. This will go away once we land " +
+     "the initial suite of new tests");
+});

devtools/client/definitions.js

@@ -182,14 +182,28 @@ Tools.jsdebugger = {
   }
 };
 
-if (Services.prefs.getBoolPref("devtools.debugger.new-debugger-frontend")) {
-  const NewDebuggerPanel = require("devtools/client/debugger/new/panel").DebuggerPanel;
+function switchDebugger() {
+  if (Services.prefs.getBoolPref("devtools.debugger.new-debugger-frontend")) {
+    const NewDebuggerPanel = require("devtools/client/debugger/new/panel").DebuggerPanel;
 
-  Tools.jsdebugger.url = "chrome://devtools/content/debugger/new/index.html";
-  Tools.jsdebugger.build = function (iframeWindow, toolbox) {
-    return new NewDebuggerPanel(iframeWindow, toolbox);
-  };
+    Tools.jsdebugger.url = "chrome://devtools/content/debugger/new/index.html";
+    Tools.jsdebugger.build = function (iframeWindow, toolbox) {
+      return new NewDebuggerPanel(iframeWindow, toolbox);
+    };
+  } else {
+    Tools.jsdebugger.url = "chrome://devtools/content/debugger/debugger.xul";
+    Tools.jsdebugger.build = function (iframeWindow, toolbox) {
+      return new DebuggerPanel(iframeWindow, toolbox);
+    };
+  }
 }
+switchDebugger();
+
+Services.prefs.addObserver(
+  "devtools.debugger.new-debugger-frontend",
+  { observe: switchDebugger },
+  false
+);
 
 Tools.styleEditor = {
   id: "styleeditor",