Service cleanups...

runtime/vm/service_event.cc

Index: runtime/vm/service_event.cc
diff --git a/runtime/vm/service_event.cc b/runtime/vm/service_event.cc
index a60ca8b5fa329a76ab4b1da95972ddef32683646..0583da4f7ccb8511378b8cc7fd3f42dad5da3a0c 100644
--- a/runtime/vm/service_event.cc
+++ b/runtime/vm/service_event.cc
@@ -96,8 +96,17 @@ void ServiceEvent::PrintJSON(JSONStream* js) const {
   jsobj.AddProperty("type", "Event");
   jsobj.AddProperty("kind", EventTypeToCString(type()));
   jsobj.AddProperty("isolate", isolate());
-  if (breakpoint() != NULL) {
-    jsobj.AddProperty("breakpoint", breakpoint());
+  if (type() == kPauseBreakpoint) {
+    JSONArray jsarr(&jsobj, "pauseBreakpoints");
+    // TODO(rmacnak): If we are paused at more than one breakpoint,
+    // provide it here.
+    if (breakpoint() != NULL) {
+      jsarr.AddValue(breakpoint());
+    }
+  } else {
+    if (breakpoint() != NULL) {
+      jsobj.AddProperty("breakpoint", breakpoint());
+    }
   }
   if (top_frame() != NULL) {
     JSONObject jsFrame(&jsobj, "topFrame");