Bug 1024774 - Followup: Don't redefine the Debugger property in xpcshell tests;

r=jorendorff

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

@@ -3,9 +3,10 @@
 
 // Test that we can read core dumps into HeapSnapshot instances.
 
-const { addDebuggerToGlobal } = Cu.import("resource://gre/modules/jsdebugger.jsm", {});
-var Debugger;
-addDebuggerToGlobal(this);
+if (typeof Debugger != "function") {
+  const { addDebuggerToGlobal } = Cu.import("resource://gre/modules/jsdebugger.jsm", {});
+  addDebuggerToGlobal(this);
+}
 
 function run_test() {
   const filePath = getFilePath("core-dump.tmp", true, true);

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

@@ -3,9 +3,10 @@
 
 // Test the ChromeUtils interface.
 
-const { addDebuggerToGlobal } = Cu.import("resource://gre/modules/jsdebugger.jsm", {});
-var Debugger;
-addDebuggerToGlobal(this);
+if (typeof Debugger != "function") {
+  const { addDebuggerToGlobal } = Cu.import("resource://gre/modules/jsdebugger.jsm", {});
+  addDebuggerToGlobal(this);
+}
 
 function run_test() {
   ok(ChromeUtils, "Should be able to get the ChromeUtils interface");