Debugger wire protocol changes

runtime/bin/dbg_message.cc

Index: runtime/bin/dbg_message.cc
===================================================================
--- runtime/bin/dbg_message.cc	(revision 21684)
+++ runtime/bin/dbg_message.cc	(working copy)
@@ -210,8 +210,8 @@
 
 
 static void FormatValue(dart::TextBuffer* buf, Dart_Handle object) {
-  if (Dart_IsInteger(object)) {
-    buf->Printf("\"kind\":\"integer\",");
+  if (Dart_IsNumber(object)) {
+    buf->Printf("\"kind\":\"number\",");
   } else if (Dart_IsString(object)) {
     buf->Printf("\"kind\":\"string\",");
   } else if (Dart_IsBoolean(object)) {
@@ -223,6 +223,11 @@
     buf->Printf("\"kind\":\"list\",\"length\":%"Pd",", len);
   } else {
     buf->Printf("\"kind\":\"object\",");
+    intptr_t class_id = 0;
+    Dart_Handle res = Dart_GetObjClassId(object, &class_id);
+    if (!Dart_IsError(res)) {
+      buf->Printf("\"classId\":%"Pd",", class_id);
+    }
   }
   buf->Printf("\"text\":\"");
   const intptr_t max_chars = 250;
@@ -1163,12 +1168,6 @@
   msg.Printf("{ \"event\": \"breakpointResolved\", \"params\": {");
   msg.Printf("\"breakpointId\": %"Pd"", bp_id);
 
-  // TODO(hausner): remove url and line elements.
-  msg.Printf(", \"url\":");
-  FormatEncodedString(&msg, location.script_url);
-  int line_number = GetIntValue(Dart_GetBreakpointLine(bp_id));
-  msg.Printf(",\"line\":%d", line_number);
-
   msg.Printf(", \"isolateId\":%"Pd64"", isolate_id);
   ASSERT(!Dart_IsNull(location.script_url));
   ASSERT(Dart_IsString(location.script_url));