From eedb27e4b2565394e09f5c54c3e12ca3d3aa8496 Mon Sep 17 00:00:00 2001
From: Panos Astithas <past@mozilla.com>
Date: Thu, 2 May 2013 20:39:48 +0300
Subject: [PATCH] Add more logging for bug 847558 (on amazon ec2 vm's
 browser_dbg_createChrome.js hangs on opt builds); rs=robcee

---
 browser/devtools/debugger/DebuggerUI.jsm                   | 3 +++
 browser/devtools/debugger/test/browser_dbg_createChrome.js | 7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/browser/devtools/debugger/DebuggerUI.jsm b/browser/devtools/debugger/DebuggerUI.jsm
index af26d1f95f2d..0cff12f81630 100644
--- a/browser/devtools/debugger/DebuggerUI.jsm
+++ b/browser/devtools/debugger/DebuggerUI.jsm
@@ -488,13 +488,16 @@ ChromeDebuggerProcess.prototype = {
   close: function RDP_close() {
     dumpn("Closing chrome debugging process");
     if (!this.globalUI) {
+      dumpn("globalUI is missing");
       return;
     }
     delete this.globalUI._chromeDebugger;
 
     if (this._dbgProcess.isRunning) {
+      dumpn("Killing chrome debugging process...");
       this._dbgProcess.kill();
     }
+    dumpn("...done.");
     if (typeof this._closeCallback == "function") {
       this._closeCallback.call({}, this);
     }
diff --git a/browser/devtools/debugger/test/browser_dbg_createChrome.js b/browser/devtools/debugger/test/browser_dbg_createChrome.js
index 98500199aef0..04e06f4f5057 100644
--- a/browser/devtools/debugger/test/browser_dbg_createChrome.js
+++ b/browser/devtools/debugger/test/browser_dbg_createChrome.js
@@ -48,8 +48,8 @@ function testSimpleCall() {
     ok(gProcess._dbgProfile.name,
       "The remote debugger profile doesn't have a name...");
 
-    info("profile localDir: " + gProcess._dbgProfile.localDir);
-    info("profile rootDir: " + gProcess._dbgProfile.rootDir);
+    info("profile localDir: " + gProcess._dbgProfile.localDir.path);
+    info("profile rootDir: " + gProcess._dbgProfile.rootDir.path);
     info("profile name: " + gProcess._dbgProfile.name);
 
     let profileService = Cc["@mozilla.org/toolkit/profile-service;1"]
@@ -64,7 +64,8 @@ function testSimpleCall() {
     is(profile.rootDir.path, gProcess._dbgProfile.rootDir.path,
       "The remote debugger profile doesn't have the correct rootDir!");
 
-    DebuggerUI.toggleChromeDebugger();
+    let chromeDebug = DebuggerUI.toggleChromeDebugger();
+    info("toggleChromeDebugger() returned " + chromeDebug);
   }}, 0);
 }