From f38be223d0f50480fa63352607eb78153383c91a Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Mon, 25 Nov 2013 10:31:46 -0800
Subject: [PATCH] Bug 942362 - Use DevToolsUtils.reportException in
 dbg-client.jsm; r=past

---
 toolkit/devtools/client/dbg-client.jsm | 35 ++++++++++----------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/toolkit/devtools/client/dbg-client.jsm b/toolkit/devtools/client/dbg-client.jsm
index 3c458d1888c0..75020a50e31d 100644
--- a/toolkit/devtools/client/dbg-client.jsm
+++ b/toolkit/devtools/client/dbg-client.jsm
@@ -160,9 +160,7 @@ function eventSource(aProto) {
         listener.apply(null, arguments);
       } catch (e) {
         // Prevent a bad listener from interfering with the others.
-        let msg = e + ": " + e.stack;
-        Cu.reportError(msg);
-        dumpn(msg);
+        DevToolsUtils.reportException("notify event '" + name + "'", e);
       }
     }
   }
@@ -322,10 +320,7 @@ DebuggerClient.requester = function DC_requester(aPacketSkeleton, { telemetry,
         try {
           thisCallback(aResponse);
         } catch (e) {
-          let msg = "Error executing callback passed to debugger client: "
-            + e + "\n" + e.stack;
-          dumpn(msg);
-          Cu.reportError(msg);
+          DevToolsUtils.reportException("DebuggerClient.requester callback", e);
         }
       }
 
@@ -650,10 +645,10 @@ DebuggerClient.prototype = {
 
     resolve(packet).then(aPacket => {
       if (!aPacket.from) {
-        let msg = "Server did not specify an actor, dropping packet: " +
-                  JSON.stringify(aPacket);
-        Cu.reportError(msg);
-        dumpn(msg);
+        DevToolsUtils.reportException(
+          "onPacket",
+          new Error("Server did not specify an actor, dropping packet: " +
+                    JSON.stringify(aPacket)));
         return;
       }
 
@@ -703,8 +698,7 @@ DebuggerClient.prototype = {
 
       this._sendRequests();
     }, function (ex) {
-      dumpn("Error handling response: " + ex + " - stack:\n" + ex.stack);
-      Cu.reportError(ex.message + "\n" + ex.stack);
+      DevToolsUtils.reportException("onPacket handler", ex);
     });
   },
 
@@ -830,14 +824,13 @@ ProtocolCompatibility.prototype = {
           this.rejectFeature(feature.name);
           break;
         default:
-          Cu.reportError(new Error(
-            "Bad return value from `onPacketTest` for feature '"
-              + feature.name + "'"));
+          DevToolsUtils.reportException(
+            "PC__detectFeatures",
+            new Error("Bad return value from `onPacketTest` for feature '"
+                      + feature.name + "'"));
         }
       } catch (ex) {
-        Cu.reportError("Error detecting support for feature '"
-                       + feature.name + "':" + ex.message + "\n"
-                       + ex.stack);
+        DevToolsUtils.reportException("PC__detectFeatures", ex);
       }
     }
   },
@@ -2196,9 +2189,7 @@ this.debuggerSocketConnect = function debuggerSocketConnect(aHost, aPort)
     transport = new DebuggerTransport(s.openInputStream(0, 0, 0),
                                       s.openOutputStream(0, 0, 0));
   } catch(e) {
-    let msg = e + ": " + e.stack;
-    Cu.reportError(msg);
-    dumpn(msg);
+    DevToolsUtils.reportException("debuggerSocketConnect", e);
     throw e;
   }
   return transport;