Service protocol cleanups.

runtime/vm/service.cc

Index: runtime/vm/service.cc
diff --git a/runtime/vm/service.cc b/runtime/vm/service.cc
index 10bd9982f1dbd9479759ff6ebb9cbeb0624d1faa..68a85b9d84321fd85591dd1e5052e2e901cd2a1d 100644
--- a/runtime/vm/service.cc
+++ b/runtime/vm/service.cc
@@ -762,7 +762,7 @@ void Service::SendEchoEvent(Isolate* isolate, const char* text) {
     JSONObject jsobj(&js);
     {
       JSONObject event(&jsobj, "event");
-      event.AddProperty("type", "ServiceEvent");
+      event.AddProperty("type", "Event");
       event.AddProperty("eventType", "_Echo");
       event.AddProperty("isolate", isolate);
       if (text != NULL) {
@@ -2105,11 +2105,11 @@ static bool Resume(Isolate* isolate, JSONStream* js) {
   }
   if (isolate->debugger()->PauseEvent() != NULL) {
     if (step_param != NULL) {
-      if (strcmp(step_param, "into") == 0) {
+      if (strcmp(step_param, "Into") == 0) {
         isolate->debugger()->SetSingleStep();
-      } else if (strcmp(step_param, "over") == 0) {
+      } else if (strcmp(step_param, "Over") == 0) {
         isolate->debugger()->SetStepOver();
-      } else if (strcmp(step_param, "out") == 0) {
+      } else if (strcmp(step_param, "Out") == 0) {
         isolate->debugger()->SetStepOut();
       } else {
         PrintInvalidParamError(js, "step");
@@ -2287,7 +2287,7 @@ void Service::SendGraphEvent(Isolate* isolate) {
       JSONObject jsobj(&js);
       {
         JSONObject event(&jsobj, "event");
-        event.AddProperty("type", "ServiceEvent");
+        event.AddProperty("type", "Event");
         event.AddProperty("eventType", "_Graph");
         event.AddProperty("isolate", isolate);