Service protocol cleanups.

runtime/vm/service.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/service.h"
 
 #include "include/dart_api.h"
 #include "platform/globals.h"
 
 #include "vm/compiler.h"
@@ skipping 744 matching lines @@
   return true;
 }
 
 
 void Service::SendEchoEvent(Isolate* isolate, const char* text) {
   JSONStream js;
   {
     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) {
         event.AddProperty("text", text);
       }
     }
   }
   const String& message = String::Handle(String::New(js.ToCString()));
   uint8_t data[] = {0, 128, 255};
   SendEvent(message, data, sizeof(data));
@@ skipping 1322 matching lines @@
   }
   if (isolate->message_handler()->paused_on_exit()) {
     isolate->message_handler()->set_pause_on_exit(false);
     JSONObject jsobj(js);
     jsobj.AddProperty("type", "Success");
     // We don't send a resume event because we will be exiting.
     return true;
   }
   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");
         return true;
       }
     }
     isolate->Resume();
     JSONObject jsobj(js);
     jsobj.AddProperty("type", "Success");
     return true;
@@ skipping 157 matching lines @@
   // snapshot in megabyte-sized chunks instead.
   const intptr_t kChunkSize = 1 * MB;
   intptr_t num_chunks =
       (stream.bytes_written() + (kChunkSize - 1)) / kChunkSize;
   for (intptr_t i = 0; i < num_chunks; i++) {
     JSONStream js;
     {
       JSONObject jsobj(&js);
       {
         JSONObject event(&jsobj, "event");
-        event.AddProperty("type", "ServiceEvent");
+        event.AddProperty("type", "Event");
         event.AddProperty("eventType", "_Graph");
         event.AddProperty("isolate", isolate);
 
         event.AddProperty("chunkIndex", i);
         event.AddProperty("chunkCount", num_chunks);
         event.AddProperty("nodeCount", node_count);
       }
       jsobj.AddProperty("streamId", "_Graph");
     }
 
@@ skipping 389 matching lines @@
     ServiceMethodDescriptor& method = service_methods_[i];
     if (strcmp(method_name, method.name) == 0) {
       return &method;
     }
   }
   return NULL;
 }
 
 
 }  // namespace dart