Begin migrating the vm service from a rest-style interface to a json-rpc style interface.

runtime/vm/service_test.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 "platform/globals.h"
 
 #include "include/dart_debugger_api.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
@@ skipping 195 matching lines @@
   EXPECT_EQ(reader.Type(), JSONReader::kString);
   reader.GetDecodedValueChars(buffer, kBufferSize);
   EXPECT_SUBSTRING("isolates/", buffer);
 
   // heap
   EXPECT(reader.Seek("heaps"));
   EXPECT_EQ(reader.Type(), JSONReader::kObject);
 }
 
 
-TEST_CASE(Service_StackTrace) {
-  // TODO(turnidge): Extend this test to cover a non-trivial stack trace.
-  const char* kScript =
-      "var port;\n"  // Set to our mock port by C++.
-      "\n"
-      "main() {\n"
-      "}";
-
-  Isolate* isolate = Isolate::Current();
-  Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(lib);
-
-  // Build a mock message handler and wrap it in a dart port.
-  ServiceTestMessageHandler handler;
-  Dart_Port port_id = PortMap::CreatePort(&handler);
-  Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
-  EXPECT_VALID(port);
-  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
-
-  Array& service_msg = Array::Handle();
-
-  // Get the stacktrace.
-  service_msg = Eval(lib, "[0, port, ['stacktrace'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  EXPECT_STREQ(
-      "{\"type\":\"StackTrace\",\"id\":\"stacktrace\",\"members\":[]}",
-      handler.msg());
-
-  // Malformed request.
-  service_msg = Eval(lib, "[0, port, ['stacktrace', 'jamboree'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  EXPECT_STREQ(
-      "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Command too long\","
-      "\"request\":{\"arguments\":[\"stacktrace\",\"jamboree\"],"
-      "\"option_keys\":[],\"option_values\":[]}}",
-      handler.msg());
-}
-
-
-TEST_CASE(Service_DebugBreakpoints) {
-  const char* kScript =
-      "var port;\n"  // Set to our mock port by C++.
-      "\n"
-      "main() {\n"   // We set breakpoint here.
-      "}";
-
-  Isolate* isolate = Isolate::Current();
-  Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(lib);
-  Library& vmlib = Library::Handle();
-  vmlib ^= Api::UnwrapHandle(lib);
-  EXPECT(!vmlib.IsNull());
-
-  // Build a mock message handler and wrap it in a dart port.
-  ServiceTestMessageHandler handler;
-  Dart_Port port_id = PortMap::CreatePort(&handler);
-  Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
-  EXPECT_VALID(port);
-  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
-
-  Array& service_msg = Array::Handle();
-
-  // Add a breakpoint.
-  service_msg = EvalF(lib,
-                     "[0, port, ['libraries', '%" Pd "', "
-                     "'scripts', 'test-lib', 'setBreakpoint'], "
-                      "['line'], ['3']]",
-                      vmlib.index());
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  ExpectSubstringF(
-      handler.msg(),
-      "{\"type\":\"Breakpoint\",\"id\":\"debug\\/breakpoints\\/1\","
-      "\"breakpointNumber\":1,\"enabled\":true,\"resolved\":false,"
-      "\"location\":{\"type\":\"Location\","
-      "\"script\":{\"type\":\"@Script\","
-      "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-      "\"name\":\"test-lib\",\"kind\":\"script\"},"
-      "\"tokenPos\":5}}",
-      vmlib.index());
-
-  // Get the breakpoint list.
-  service_msg = Eval(lib, "[0, port, ['debug', 'breakpoints'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  ExpectSubstringF(
-      handler.msg(),
-      "{\"type\":\"BreakpointList\",\"id\":\"debug\\/breakpoints\","
-      "\"breakpoints\":["
-      "{\"type\":\"Breakpoint\",\"id\":\"debug\\/breakpoints\\/1\","
-      "\"breakpointNumber\":1,\"enabled\":true,\"resolved\":false,"
-      "\"location\":{\"type\":\"Location\","
-      "\"script\":{\"type\":\"@Script\","
-      "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-      "\"name\":\"test-lib\",\"kind\":\"script\"},"
-      "\"tokenPos\":5}}]}",
-      vmlib.index());
-
-  // Lookup individual breakpoint.
-  service_msg = Eval(lib, "[0, port, ['debug', 'breakpoints', '1'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  ExpectSubstringF(
-      handler.msg(),
-      "{\"type\":\"Breakpoint\",\"id\":\"debug\\/breakpoints\\/1\","
-      "\"breakpointNumber\":1,\"enabled\":true,\"resolved\":false,"
-      "\"location\":{\"type\":\"Location\","
-      "\"script\":{\"type\":\"@Script\","
-      "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-      "\"name\":\"test-lib\",\"kind\":\"script\"},"
-      "\"tokenPos\":5}}",
-      vmlib.index());
-
-  // Unrecognized breakpoint subcommand.
-  service_msg =
-      Eval(lib, "[0, port, ['debug', 'breakpoints', '1', 'green'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  EXPECT_STREQ("{\"type\":\"Error\",\"id\":\"\","
-                "\"message\":\"Unrecognized subcommand: green\","
-                "\"request\":{\"arguments\":[\"debug\",\"breakpoints\","
-                                            "\"1\",\"green\"],"
-                             "\"option_keys\":[],\"option_values\":[]}}",
-               handler.msg());
-
-  // Clear breakpoint.
-  service_msg =
-      Eval(lib, "[0, port, ['debug', 'breakpoints', '1', 'clear'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  EXPECT_STREQ("{\"type\":\"Success\",\"id\":\"\"}",
-               handler.msg());
-
-  // Get the breakpoint list.
-  service_msg = Eval(lib, "[0, port, ['debug', 'breakpoints'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  EXPECT_STREQ(
-      "{\"type\":\"BreakpointList\",\"id\":\"debug\\/breakpoints\","
-      "\"breakpoints\":[]}",
-      handler.msg());
-
-  // Missing sub-command.
-  service_msg = Eval(lib, "[0, port, ['debug'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  EXPECT_STREQ(
-      "{\"type\":\"Error\",\"id\":\"\","
-       "\"message\":\"Must specify a subcommand\","
-       "\"request\":{\"arguments\":[\"debug\"],\"option_keys\":[],"
-                    "\"option_values\":[]}}",
-      handler.msg());
-
-  // Unrecognized breakpoint.
-  service_msg = Eval(lib,
-                     "[0, port, ['debug', 'breakpoints', '1111'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  EXPECT_STREQ("{\"type\":\"Error\",\"id\":\"\","
-                "\"message\":\"Unrecognized breakpoint id: 1111\","
-                "\"request\":{"
-                    "\"arguments\":[\"debug\",\"breakpoints\",\"1111\"],"
-                    "\"option_keys\":[],\"option_values\":[]}}",
-               handler.msg());
-
-  // Unrecognized subcommand.
-  service_msg = Eval(lib, "[0, port, ['debug', 'nosferatu'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  EXPECT_STREQ("{\"type\":\"Error\",\"id\":\"\","
-                "\"message\":\"Unrecognized subcommand 'nosferatu'\","
-                "\"request\":{\"arguments\":[\"debug\",\"nosferatu\"],"
-                             "\"option_keys\":[],\"option_values\":[]}}",
-               handler.msg());
-}
-
-
-// Globals used to communicate with HandlerPausedEvent.
-static intptr_t pause_line_number = 0;
-static Dart_Handle saved_lib;
-static ServiceTestMessageHandler* saved_handler = NULL;
-
-static void HandlePausedEvent(Dart_IsolateId isolate_id,
-                              intptr_t bp_id,
-                              const Dart_CodeLocation& loc) {
-  Isolate* isolate = Isolate::Current();
-  Debugger* debugger = isolate->debugger();
-
-  // The debugger knows that it is paused, and why.
-  EXPECT(debugger->IsPaused());
-  const DebuggerEvent* event = debugger->PauseEvent();
-  EXPECT(event != NULL);
-  EXPECT(event->type() == DebuggerEvent::kBreakpointReached);
-
-  // Save the last line number seen by this handler.
-  pause_line_number = event->top_frame()->LineNumber();
-
-  // Single step
-  Array& service_msg = Array::Handle();
-  service_msg = Eval(saved_lib,
-                     "[0, port, ['debug', 'resume'], "
-                     "['step'], ['into']]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  saved_handler->HandleNextMessage();
-  EXPECT_STREQ("{\"type\":\"Success\",\"id\":\"\"}",
-               saved_handler->msg());
-}
-
-
-TEST_CASE(Service_Stepping) {
-  const char* kScript =
-      "var port;\n"  // Set to our mock port by C++.
-      "var value = 0;\n"
-      "\n"
-      "main() {\n"   // We set breakpoint here.
-      "  value++;\n"
-      "  value++;\n"
-      "  value++;\n"
-      "}";           // We step up to here.
-
-  Isolate* isolate = Isolate::Current();
-  Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(lib);
-  Library& vmlib = Library::Handle();
-  vmlib ^= Api::UnwrapHandle(lib);
-  EXPECT(!vmlib.IsNull());
-  saved_lib = lib;
-
-  // Build a mock message handler and wrap it in a dart port.
-  ServiceTestMessageHandler handler;
-  saved_handler = &handler;
-  Dart_Port port_id = PortMap::CreatePort(&handler);
-  Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
-  EXPECT_VALID(port);
-  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
-
-  Array& service_msg = Array::Handle();
-
-  // Add a breakpoint.
-  service_msg = EvalF(lib,
-                      "[0, port, ['libraries', '%" Pd "', "
-                      "'scripts', 'test-lib', 'setBreakpoint'], "
-                      "['line'], ['4']]",
-                      vmlib.index());
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  ExpectSubstringF(
-      handler.msg(),
-      "{\"type\":\"Breakpoint\",\"id\":\"debug\\/breakpoints\\/1\","
-      "\"breakpointNumber\":1,\"enabled\":true,\"resolved\":false,"
-      "\"location\":{\"type\":\"Location\","
-      "\"script\":{\"type\":\"@Script\","
-      "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-      "\"name\":\"test-lib\",\"kind\":\"script\"},"
-      "\"tokenPos\":11}}",
-      vmlib.index());
-
-  pause_line_number = -1;
-  Dart_SetPausedEventHandler(HandlePausedEvent);
-
-  // Run the program.
-  Dart_Handle result = Dart_Invoke(lib, NewString("main"), 0, NULL);
-  EXPECT_VALID(result);
-
-  // We were able to step to the last line in main.
-  EXPECT_EQ(8, pause_line_number);
-}
-
-
 TEST_CASE(Service_Objects) {
   // TODO(turnidge): Extend this test to cover a non-trivial stack trace.
   const char* kScript =
       "var port;\n"     // Set to our mock port by C++.
       "var validId;\n"  // Set to a valid object id by C++.
       "\n"
       "main() {\n"
       "}";
 
   Isolate* isolate = Isolate::Current();
@@ skipping 132 matching lines @@
   // object id ring / invalid => expired
   service_msg = Eval(lib, "[0, port, ['objects', '99999999'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("_vmName");
   EXPECT_STREQ(
       "{\"type\":\"Sentinel\",\"id\":\"objects\\/expired\","
       "\"valueAsString\":\"<expired>\"}",
       handler.msg());
 
-  // expired/eval => error
-  service_msg = Eval(lib, "[0, port, ['objects', 'expired', 'eval'], [], []]");
+  // Retained by single instance.
+  service_msg = Eval(
+      lib,
+      "[0, port, 'getRetainedSize', "
+      "['targetId'], ['objects/$validId']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("_vmName");
-  EXPECT_STREQ(
-      "{\"type\":\"Error\",\"id\":\"\","
-      "\"message\":\"expected at most 2 arguments but found 3\\n\","
-      "\"request\":{\"arguments\":[\"objects\",\"expired\",\"eval\"],"
-      "\"option_keys\":[],\"option_values\":[]}}",
-      handler.msg());
-
-  // int/eval => good
-  service_msg = Eval(lib,
-                     "[0, port, ['objects', 'int-123', 'eval'], "
-                     "['expr'], ['this+99']]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  handler.filterMsg("_vmName");
-  EXPECT_STREQ(
-      "{\"type\":\"@int\",\"_vmType\":\"@Smi\","
-      "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
-      "\"name\":\"_Smi\",},"
-      "\"id\":\"objects\\/int-222\","
-      "\"valueAsString\":\"222\"}",
-      handler.msg());
-
-  // eval returning null works
-  service_msg = Eval(lib,
-                     "[0, port, ['objects', 'int-123', 'eval'], "
-                     "['expr'], ['null']]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  handler.filterMsg("_vmName");
-  EXPECT_STREQ(
-      "{\"type\":\"@null\",\"id\":\"objects\\/null\","
-      "\"valueAsString\":\"null\"}",
-      handler.msg());
-
-  // object id ring / invalid => expired
-  service_msg = Eval(lib, "[0, port, ['objects', '99999999', 'eval'], "
-                     "['expr'], ['this']]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  handler.filterMsg("_vmName");
-  EXPECT_STREQ(
-      "{\"type\":\"Error\",\"id\":\"\",\"kind\":\"EvalExpired\","
-      "\"message\":\"attempt to evaluate against expired object\\n\","
-      "\"request\":{\"arguments\":[\"objects\",\"99999999\",\"eval\"],"
-      "\"option_keys\":[\"expr\"],\"option_values\":[\"this\"]}}",
-      handler.msg());
-
-  // Extra arg to eval.
-  service_msg = Eval(lib,
-                     "[0, port, ['objects', 'int-123', 'eval', 'foo'], "
-                     "['expr'], ['this+99']]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  handler.filterMsg("_vmName");
-  EXPECT_STREQ(
-      "{\"type\":\"Error\",\"id\":\"\","
-      "\"message\":\"expected at most 3 arguments but found 4\\n\","
-      "\"request\":{\"arguments\":[\"objects\",\"int-123\",\"eval\",\"foo\"],"
-      "\"option_keys\":[\"expr\"],\"option_values\":[\"this+99\"]}}",
-      handler.msg());
-
-  // Retained by single instance.
-  service_msg = Eval(lib,
-                     "[0, port, ['objects', '$validId', 'retained'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  handler.filterMsg("_vmName");
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"objects\\/int-%" Pd "\"",
                    arr.raw()->Size() + arr.At(0)->Size());
 
   // Retaining path to 'arr', limit 1.
   service_msg = Eval(
       lib,
-      "[0, port, ['objects', '$validId', 'retaining_path'], ['limit'], ['1']]");
+      "[0, port, 'getRetainingPath', "
+      "['targetId', 'limit'], ['objects/$validId', '1']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(
       handler.msg(),
-      "{\"type\":\"RetainingPath\",\"id\":\"retaining_path\",\"length\":1,"
+      "{\"type\":\"RetainingPath\",\"length\":1,"
       "\"elements\":[{\"index\":0,\"value\":{\"type\":\"@List\"");
 
   // Retaining path missing limit.
   service_msg = Eval(
       lib,
-      "[0, port, ['objects', '$validId', 'retaining_path'], [], []]");
+      "[0, port, 'getRetainingPath', "
+      "['targetId'], ['objects/$validId']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(), "{\"type\":\"Error\"");
-
-  // eval against list containing an internal object.
-  Object& internal_object = Object::Handle();
-  internal_object = LiteralToken::New();
-  arr.SetAt(0, internal_object);
-  service_msg = Eval(lib,
-                     "[0, port, ['objects', '$validId', 'eval'], "
-                     "['expr'], ['toString()']]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  ExpectSubstringF(handler.msg(), "\"type\":\"Error\"");
-  ExpectSubstringF(
-      handler.msg(),
-      "\"message\":\"attempt to evaluate against internal VM object\\n\"");
 }
 
 
 TEST_CASE(Service_RetainingPath) {
   const char* kScript =
       "var port;\n"    // Set to our mock port by C++.
       "var id0;\n"     // Set to an object id by C++.
       "var id1;\n"     // Ditto.
       "var idElem;\n"  // Ditto.
       "class Foo {\n"
@@ skipping 53 matching lines @@
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
   Array& service_msg = Array::Handle();
 
   // Retaining path to 'foo0', limit 2.
   service_msg = Eval(
       lib,
-      "[0, port, ['objects', '$id0', 'retaining_path'], ['limit'], ['2']]");
+      "[0, port, 'getRetainingPath', "
+      "['targetId', 'limit'], ['objects/$id0', '2']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(
       handler.msg(),
-      "{\"type\":\"RetainingPath\",\"id\":\"retaining_path\",\"length\":2,"
+      "{\"type\":\"RetainingPath\",\"length\":2,"
       "\"elements\":[{\"index\":0,\"value\":{\"type\":\"@String\"");
   ExpectSubstringF(handler.msg(), "\"parentField\":{\"type\":\"@Field\"");
   ExpectSubstringF(handler.msg(), "\"name\":\"f0\"");
   ExpectSubstringF(handler.msg(),
       "{\"index\":1,\"value\":{\"type\":\"@Instance\"");
 
   // Retaining path to 'foo1', limit 2.
   service_msg = Eval(
       lib,
-      "[0, port, ['objects', '$id1', 'retaining_path'], ['limit'], ['2']]");
+      "[0, port,  'getRetainingPath', "
+      "['targetId', 'limit'], ['objects/$id1', '2']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(
       handler.msg(),
-      "{\"type\":\"RetainingPath\",\"id\":\"retaining_path\",\"length\":2,"
+      "{\"type\":\"RetainingPath\",\"length\":2,"
       "\"elements\":[{\"index\":0,\"value\":{\"type\":\"@String\"");
   ExpectSubstringF(handler.msg(), "\"parentField\":{\"type\":\"@Field\"");
   ExpectSubstringF(handler.msg(), "\"name\":\"f1\"");
   ExpectSubstringF(handler.msg(),
       "{\"index\":1,\"value\":{\"type\":\"@Instance\"");
 
   // Retaining path to 'elem', limit 2.
   service_msg = Eval(
       lib,
-      "[0, port, ['objects', '$idElem', 'retaining_path'], ['limit'], ['2']]");
+      "[0, port, 'getRetainingPath', "
+      "['targetId', 'limit'], ['objects/$idElem', '2']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(
       handler.msg(),
-      "{\"type\":\"RetainingPath\",\"id\":\"retaining_path\",\"length\":2,"
+      "{\"type\":\"RetainingPath\",\"length\":2,"
       "\"elements\":[{\"index\":0,\"value\":{\"type\":\"@String\"");
   ExpectSubstringF(handler.msg(), "\"parentListIndex\":%" Pd, kElemIndex);
   ExpectSubstringF(handler.msg(),
       "{\"index\":1,\"value\":{\"type\":\"@List\"");
 }
 
 
 TEST_CASE(Service_Libraries) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
@@ skipping 19 matching lines @@
   Array& service_msg = Array::Handle();
 
   // Request library.
   service_msg = EvalF(lib,
                       "[0, port, ['libraries', '%" Pd "'], [], []]",
                       vmlib.index());
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Library\"", handler.msg());
   EXPECT_SUBSTRING("\"url\":\"test-lib\"", handler.msg());
-
-  // Evaluate an expression from a library.
-  service_msg = EvalF(lib,
-                      "[0, port, ['libraries', '%" Pd "', 'eval'], "
-                      "['expr'], ['libVar - 1']]",
-                      vmlib.index());
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  handler.filterMsg("_vmName");
-  EXPECT_STREQ(
-      "{\"type\":\"@int\",\"_vmType\":\"@Smi\","
-      "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
-      "\"name\":\"_Smi\",},\"id\":\"objects\\/int-54320\","
-      "\"valueAsString\":\"54320\"}",
-      handler.msg());
 }
 
 
 TEST_CASE(Service_Classes) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "class A {\n"
       "  var a;\n"
       "  static var cobra = 11235;\n"
@@ skipping 30 matching lines @@
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Array& service_msg = Array::Handle();
 
   // Request an invalid class id.
   service_msg = Eval(lib, "[0, port, ['classes', '999999'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
-    "{\"type\":\"Error\",\"id\":\"\","
+    "{\"type\":\"Error\","
     "\"message\":\"999999 is not a valid class id.\","
     "\"request\":{\"arguments\":[\"classes\",\"999999\"],"
     "\"option_keys\":[],\"option_values\":[]}}", handler.msg());
 
   // Request the class A over the service.
   service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "'], [], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Class\"", handler.msg());
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\",\"name\":\"A\",", cid);
   ExpectSubstringF(handler.msg(), "\"allocationStats\":");
   ExpectSubstringF(handler.msg(), "\"tokenPos\":");
   ExpectSubstringF(handler.msg(), "\"endTokenPos\":");
 
-  // Evaluate an expression from class A.
-  service_msg = EvalF(lib,
-                      "[0, port, ['classes', '%" Pd "', 'eval'], "
-                      "['expr'], ['cobra + 100000']]", cid);
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  handler.filterMsg("_vmName");
-  EXPECT_STREQ(
-      "{\"type\":\"@int\",\"_vmType\":\"@Smi\","
-      "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
-      "\"name\":\"_Smi\",},"
-      "\"id\":\"objects\\/int-111235\","
-      "\"valueAsString\":\"111235\"}",
-      handler.msg());
-
   // Request function 'b' from class A.
   service_msg = EvalF(lib,
                       "[0, port, ['classes', '%" Pd "', 'functions', 'b'],"
                       "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Function\"", handler.msg());
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\\/functions\\/b\","
                    "\"name\":\"b\",", cid);
 
   // Request field 0 from class A.
   service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "', 'fields', '0'],"
                       "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Field\"", handler.msg());
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\\/fields\\/0\","
                    "\"name\":\"a\",", cid);
 
   // Invalid sub command.
   service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "', 'huh', '0'],"
                       "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Invalid sub collection huh\""
+    "{\"type\":\"Error\",\"message\":\"Invalid sub collection huh\""
     ",\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"huh\",\"0\"],\"option_keys\":[],"
     "\"option_values\":[]}}", cid);
 
   // Invalid field request.
   service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "', 'fields', '9'],"
                       "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Field 9 not found\","
+    "{\"type\":\"Error\",\"message\":\"Field 9 not found\","
     "\"request\":{\"arguments\":[\"classes\",\"%" Pd "\",\"fields\",\"9\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
   // Invalid function request.
   service_msg = EvalF(lib,
                       "[0, port, ['classes', '%" Pd "', 'functions', '9'],"
                       "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Function 9 not found\","
+    "{\"type\":\"Error\",\"message\":\"Function 9 not found\","
     "\"request\":{\"arguments\":[\"classes\",\"%" Pd "\",\"functions\",\"9\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
 
   // Invalid field subcommand.
   service_msg = EvalF(lib,
                       "[0, port, ['classes', '%" Pd "', 'fields', '9', 'x']"
                       ",[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Command too long\","
+    "{\"type\":\"Error\",\"message\":\"Command too long\","
     "\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"fields\",\"9\",\"x\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
   // Invalid function command.
   service_msg = EvalF(lib,
                       "[0, port, ['classes', '%" Pd "', 'functions', '0',"
                       "'x', 'y'], [], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"id\":\"\","
+    "{\"type\":\"Error\","
     "\"message\":\"Command should have 4 or 5 arguments\","
     "\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"functions\",\"0\",\"x\",\"y\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
   // Invalid function subcommand with valid function id.
   service_msg = EvalF(lib,
                       "[0, port, ['classes', '%" Pd "', 'functions', 'b',"
                       "'x'], [], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Invalid sub command x\","
+    "{\"type\":\"Error\",\"message\":\"Invalid sub command x\","
     "\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"functions\",\"b\",\"x\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
   // Retained size of all instances of class B.
   const Class& class_b = Class::Handle(GetClass(vmlib, "B"));
   EXPECT(!class_b.IsNull());
   const Instance& b0 = Instance::Handle(Instance::New(class_b));
   const Instance& b1 = Instance::Handle(Instance::New(class_b));
-  service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "', 'retained'],"
-                      "[], []]", class_b.id());
+  service_msg = EvalF(lib, "[0, port, 'getRetainedSize', "
+                      "['targetId'], ['classes/%" Pd "']]", class_b.id());
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"objects\\/int-%" Pd "\"",
                    b0.raw()->Size() + b1.raw()->Size());
   // ... and list the instances of class B.
-  service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "', 'instances'],"
-                      "['limit'], ['3']]", class_b.id());
+  service_msg = EvalF(lib, "[0, port, 'getInstances', "
+                      "['classId', 'limit'], ['classes/%" Pd "', '3']]",
+                      class_b.id());
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(), "\"type\":\"InstanceSet\"");
   ExpectSubstringF(handler.msg(), "\"totalCount\":2");
   ExpectSubstringF(handler.msg(), "\"sampleCount\":2");
   // TODO(koda): Actually parse the response.
   static const intptr_t kInstanceListId = 0;
   ExpectSubstringF(handler.msg(), "\"id\":\"objects\\/%" Pd "\",\"length\":2",
                    kInstanceListId);
   Array& list = Array::Handle();
   ObjectIdRing::LookupResult kind;
   list ^= isolate->object_id_ring()->GetObjectForId(kInstanceListId, &kind);
   EXPECT_EQ(2, list.Length());
   // The list should contain {b0, b1}.
   EXPECT((list.At(0) == b0.raw() && list.At(1) == b1.raw()) ||
          (list.At(0) == b1.raw() && list.At(1) == b0.raw()));
   // ... and if limit is 1, we one get one of them.
-  service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "', 'instances'],"
-                      "['limit'], ['1']]", class_b.id());
+  service_msg = EvalF(lib, "[0, port, 'getInstances', "
+                      "['classId', 'limit'], ['classes/%" Pd "', '1']]",
+                      class_b.id());
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(), "\"totalCount\":2");
   ExpectSubstringF(handler.msg(), "\"sampleCount\":1");
 }
 
 
 TEST_CASE(Service_SetSource) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
@@ skipping 174 matching lines @@
   EXPECT_SUBSTRING("\"name\":\"A<A<bool>>\"", handler.msg());
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\\/types\\/1\"", cid);
 
   // Request for non-existent canonical type from class A.
   service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "', 'types', '42'],"
                       "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"id\":\"\","
+    "{\"type\":\"Error\","
     "\"message\":\"Canonical type 42 not found\""
     ",\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"types\",\"42\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
   // Request canonical type arguments. Expect <A<bool>> to be listed.
   service_msg = EvalF(lib, "[0, port, ['typearguments'],"
                       "[], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
@@ skipping 55 matching lines @@
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Array& service_msg = Array::Handle();
 
   // Request an invalid code object.
   service_msg = Eval(lib, "[0, port, ['code', '0'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
-    "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Malformed code id: 0\","
+    "{\"type\":\"Error\",\"message\":\"Malformed code id: 0\","
     "\"request\":{\"arguments\":[\"code\",\"0\"],"
     "\"option_keys\":[],\"option_values\":[]}}", handler.msg());
 
   // The following test checks that a code object can be found only
   // at compile_timestamp()-code.EntryPoint().
   service_msg = EvalF(lib, "[0, port, ['code', '%" Px64"-%" Px "'], [], []]",
                       compile_timestamp,
                       entry);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
@@ skipping 351 matching lines @@
       "\"owningLibrary\":{\"type\":\"@Library\","
       "\"id\":\"libraries\\/%" Pd "\",\"name\":\"\","
       "\"url\":\"test-lib\"},"
       "\"source\":\"var port;\\n\\nmain() {\\n}\","
       "\"tokenPosTable\":[[1,0,1,1,5,2,9],[3,5,1,6,5,7,6,8,8],[4,10,1]]}",
       vmlib.index(), vmlib.index());
   EXPECT_STREQ(buf, handler.msg());
 }
 
 
-// TODO(zra): Remove when tests are ready to enable.
-#if !defined(TARGET_ARCH_ARM64)
-
-TEST_CASE(Service_Coverage) {
-  const char* kScript =
-      "var port;\n"  // Set to our mock port by C++.
-      "\n"
-      "var x = 7;\n"
-      "main() {\n"
-      "  x = x * x;\n"
-      "  x = x / 13;\n"
-      "}";
-
-  Isolate* isolate = Isolate::Current();
-  Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(lib);
-  Library& vmlib = Library::Handle();
-  vmlib ^= Api::UnwrapHandle(lib);
-  EXPECT(!vmlib.IsNull());
-  Dart_Handle result = Dart_Invoke(lib, NewString("main"), 0, NULL);
-  EXPECT_VALID(result);
-
-  // Build a mock message handler and wrap it in a dart port.
-  ServiceTestMessageHandler handler;
-  Dart_Port port_id = PortMap::CreatePort(&handler);
-  Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
-  EXPECT_VALID(port);
-  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
-
-  Array& service_msg = Array::Handle();
-  service_msg = Eval(lib, "[0, port, ['coverage'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-
-  char buf[1024];
-  OS::SNPrint(buf, sizeof(buf),
-              "{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
-              "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-              "\"name\":\"test-lib\","
-              "\"kind\":\"script\"},\"hits\":"
-              "[5,1,6,1]}",
-              vmlib.index());
-  EXPECT_SUBSTRING(buf, handler.msg());
-}
-
-
-TEST_CASE(Service_LibrariesScriptsCoverage) {
-  const char* kScript =
-      "var port;\n"  // Set to our mock port by C++.
-      "\n"
-      "var x = 7;\n"
-      "main() {\n"
-      "  x = x * x;\n"
-      "  x = x / 13;\n"
-      "}";
-
-  Isolate* isolate = Isolate::Current();
-  Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(lib);
-  Library& vmlib = Library::Handle();
-  vmlib ^= Api::UnwrapHandle(lib);
-  EXPECT(!vmlib.IsNull());
-  Dart_Handle result = Dart_Invoke(lib, NewString("main"), 0, NULL);
-  EXPECT_VALID(result);
-
-  // Build a mock message handler and wrap it in a dart port.
-  ServiceTestMessageHandler handler;
-  Dart_Port port_id = PortMap::CreatePort(&handler);
-  Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
-  EXPECT_VALID(port);
-  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
-
-  Array& service_msg = Array::Handle();
-  char buf[1024];
-  OS::SNPrint(buf, sizeof(buf),
-      "[0, port, ['libraries', '%" Pd  "', 'scripts', 'test-lib', 'coverage'], "
-      "[], []]",
-      vmlib.index());
-
-  service_msg = Eval(lib, buf);
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  OS::SNPrint(buf, sizeof(buf),
-      "{\"type\":\"CodeCoverage\",\"id\":\"coverage\",\"coverage\":["
-      "{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
-      "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-      "\"name\":\"test-lib\","
-      "\"kind\":\"script\"},\"hits\":[5,1,6,1]}]}", vmlib.index());
-  EXPECT_STREQ(buf, handler.msg());
-}
-
-
-TEST_CASE(Service_LibrariesCoverage) {
-  const char* kScript =
-      "var port;\n"  // Set to our mock port by C++.
-      "\n"
-      "var x = 7;\n"
-      "main() {\n"
-      "  x = x * x;\n"
-      "  x = x / 13;\n"
-      "}";
-
-  Isolate* isolate = Isolate::Current();
-  Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(lib);
-  Library& vmlib = Library::Handle();
-  vmlib ^= Api::UnwrapHandle(lib);
-  EXPECT(!vmlib.IsNull());
-  Dart_Handle result = Dart_Invoke(lib, NewString("main"), 0, NULL);
-  EXPECT_VALID(result);
-
-  // Build a mock message handler and wrap it in a dart port.
-  ServiceTestMessageHandler handler;
-  Dart_Port port_id = PortMap::CreatePort(&handler);
-  Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
-  EXPECT_VALID(port);
-  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
-
-  char buf[1024];
-  OS::SNPrint(buf, sizeof(buf),
-              "[0, port, ['libraries', '%" Pd "', 'coverage'], [], []]",
-              vmlib.index());
-
-  Array& service_msg = Array::Handle();
-  service_msg = Eval(lib, buf);
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  OS::SNPrint(buf, sizeof(buf),
-              "{\"type\":\"CodeCoverage\",\"id\":\"coverage\",\"coverage\":["
-              "{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
-              "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-              "\"name\":\"test-lib\","
-              "\"kind\":\"script\"},\"hits\":[5,1,6,1]}]}",
-              vmlib.index());
-  EXPECT_STREQ(buf, handler.msg());
-}
-
-
-TEST_CASE(Service_ClassesCoverage) {
-  const char* kScript =
-      "var port;\n"  // Set to our mock port by C++.
-      "\n"
-      "class Foo {\n"
-      "  var x;\n"
-      "  Foo(this.x);\n"
-      "  bar() {\n"
-      "    x = x * x;\n"
-      "    x = x / 13;\n"
-      "  }\n"
-      "}\n"
-      "main() {\n"
-      "  var foo = new Foo(7);\n"
-      "  foo.bar();\n"
-      "}";
-
-  Isolate* isolate = Isolate::Current();
-  Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(lib);
-  Library& vmlib = Library::Handle();
-  vmlib ^= Api::UnwrapHandle(lib);
-  EXPECT(!vmlib.IsNull());
-  Dart_Handle result = Dart_Invoke(lib, NewString("main"), 0, NULL);
-  EXPECT_VALID(result);
-
-  // Build a mock message handler and wrap it in a dart port.
-  ServiceTestMessageHandler handler;
-  Dart_Port port_id = PortMap::CreatePort(&handler);
-  Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
-  EXPECT_VALID(port);
-  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
-
-  // Look up the service id of Foo.
-  const Class& cls = Class::Handle(
-      vmlib.LookupClass(String::Handle(String::New("Foo"))));
-  ASSERT(!cls.IsNull());
-  ClassTable* table = isolate->class_table();
-  intptr_t i;
-  for (i = 1; i < table->NumCids(); i++) {
-    if (table->HasValidClassAt(i) && table->At(i) == cls.raw()) {
-      break;
-    }
-  }
-  ASSERT(i != table->NumCids());
-  char buf[1024];
-  OS::SNPrint(buf, sizeof(buf),
-              "[0, port, ['classes', '%" Pd "', 'coverage'], [], []]", i);
-
-  Array& service_msg = Array::Handle();
-  service_msg = Eval(lib, buf);
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  OS::SNPrint(buf, sizeof(buf),
-              "{\"type\":\"CodeCoverage\",\"id\":\"coverage\",\"coverage\":["
-              "{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
-              "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-              "\"name\":\"test-lib\","
-              "\"kind\":\"script\"},\"hits\":[5,1,7,4,8,3]}]}",
-              vmlib.index());
-  EXPECT_STREQ(buf, handler.msg());
-}
-
-
-TEST_CASE(Service_ClassesFunctionsCoverage) {
-  const char* kScript =
-      "var port;\n"  // Set to our mock port by C++.
-      "\n"
-      "class Foo {\n"
-      "  var x;\n"
-      "  Foo(this.x);\n"
-      "  bar() {\n"
-      "    x = x * x;\n"
-      "    x = x / 13;\n"
-      "  }\n"
-      "  badum(var a) => 4 + a;\n"
-      "}\n"
-      "main() {\n"
-      "  var foo = new Foo(7);\n"
-      "  foo.bar();\n"
-      "}";
-
-  Isolate* isolate = Isolate::Current();
-  Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(lib);
-  Library& vmlib = Library::Handle();
-  vmlib ^= Api::UnwrapHandle(lib);
-  EXPECT(!vmlib.IsNull());
-  Dart_Handle result = Dart_Invoke(lib, NewString("main"), 0, NULL);
-  EXPECT_VALID(result);
-
-  // Build a mock message handler and wrap it in a dart port.
-  ServiceTestMessageHandler handler;
-  Dart_Port port_id = PortMap::CreatePort(&handler);
-  Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
-  EXPECT_VALID(port);
-  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
-
-  // Look up the service id of Foo.
-  const Class& cls = Class::Handle(
-      vmlib.LookupClass(String::Handle(String::New("Foo"))));
-  ASSERT(!cls.IsNull());
-  ClassTable* table = isolate->class_table();
-  intptr_t i;
-  for (i = 1; i < table->NumCids(); i++) {
-    if (table->HasValidClassAt(i) && table->At(i) == cls.raw()) {
-      break;
-    }
-  }
-  ASSERT(i != table->NumCids());
-
-  // Look up the service if of the function Foo.bar.
-  const Function& func = Function::Handle(
-      cls.LookupFunction(String::Handle(String::New("bar"))));
-  ASSERT(!func.IsNull());
-
-  char buf[1024];
-  OS::SNPrint(buf, sizeof(buf),
-              "[0, port, ['classes', '%" Pd "', 'functions',"
-              "'bar', 'coverage'], [], []]", i);
-
-  Array& service_msg = Array::Handle();
-  service_msg = Eval(lib, buf);
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  OS::SNPrint(buf, sizeof(buf),
-      "{\"type\":\"CodeCoverage\",\"id\":\"coverage\",\"coverage\":["
-      "{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
-      "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-      "\"name\":\"test-lib\","
-      "\"kind\":\"script\"},\"hits\":[7,4,8,3]}]}", vmlib.index());
-  EXPECT_STREQ(buf, handler.msg());
-}
-
-#endif
-
-
 TEST_CASE(Service_AllocationProfile) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "var x = 7;\n"
       "main() {\n"
       "  x = x * x;\n"
       "  x = x / 13;\n"
       "}";
 
   Isolate* isolate = Isolate::Current();
   Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
   EXPECT_VALID(lib);
   Dart_Handle result = Dart_Invoke(lib, NewString("main"), 0, NULL);
   EXPECT_VALID(result);
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Array& service_msg = Array::Handle();
-  service_msg = Eval(lib, "[0, port, ['allocationprofile'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'getAllocationProfile', [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"AllocationProfile\"", handler.msg());
 
-  // Too long.
-  service_msg = Eval(lib, "[0, port, ['allocationprofile', 'foo'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
-
   // Bad gc option.
   service_msg = Eval(lib,
-                     "[0, port, ['allocationprofile'], ['gc'], ['cat']]");
+                     "[0, port, 'getAllocationProfile', "
+                     "['gc'], ['cat']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // Bad reset option.
-  service_msg = Eval(lib,
-                     "[0, port, ['allocationprofile'], ['reset'], ['ff']]");
+  service_msg = Eval(lib, "[0, port, 'getAllocationProfile', "
+                          "['reset'], ['ff']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // Good reset.
   service_msg =
-      Eval(lib, "[0, port, ['allocationprofile'], ['reset'], ['true']]");
+      Eval(lib,
+           "[0, port, 'getAllocationProfile', ['reset'], ['true']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"AllocationProfile\"", handler.msg());
 
   // Good GC.
   service_msg =
-      Eval(lib, "[0, port, ['allocationprofile'], ['gc'], ['full']]");
+      Eval(lib, "[0, port, 'getAllocationProfile', ['gc'], ['full']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"AllocationProfile\"", handler.msg());
 
   // Good GC and reset.
-  service_msg = Eval(lib,
-      "[0, port, ['allocationprofile'], ['gc', 'reset'], ['full', 'true']]");
+  service_msg = Eval(lib, "[0, port, 'getAllocationProfile', "
+                          "['gc', 'reset'], ['full', 'true']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"AllocationProfile\"", handler.msg());
 }
 
 
 TEST_CASE(Service_HeapMap) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "main() {\n"
       "}";
 
   Isolate* isolate = Isolate::Current();
   Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
   EXPECT_VALID(lib);
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Array& service_msg = Array::Handle();
-  service_msg = Eval(lib, "[0, port, ['heapmap'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'getHeapMap', [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"HeapMap\"", handler.msg());
   EXPECT_SUBSTRING("\"pages\":[", handler.msg());
 }
 
 
 TEST_CASE(Service_Address) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
@@ skipping 164 matching lines @@
   EXPECT_VALID(result);
 
   // Build a mock message handler and wrap it in a dart port.
   ServiceTestMessageHandler handler;
   Dart_Port port_id = PortMap::CreatePort(&handler);
   Dart_Handle port = Api::NewHandle(isolate, SendPort::New(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Array& service_msg = Array::Handle();
-  service_msg = Eval(lib, "[0, port, ['profile'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'getCpuProfile', [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Expect profile
-  EXPECT_SUBSTRING("\"type\":\"Profile\"", handler.msg());
+  EXPECT_SUBSTRING("\"type\":\"CpuProfile\"", handler.msg());
 
-  service_msg = Eval(lib, "[0, port, ['profile'], ['tags'], ['hide']]");
+  service_msg =
+      Eval(lib, "[0, port, 'getCpuProfile', ['tags'], ['None']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Expect profile
-  EXPECT_SUBSTRING("\"type\":\"Profile\"", handler.msg());
+  EXPECT_SUBSTRING("\"type\":\"CpuProfile\"", handler.msg());
 
-  service_msg = Eval(lib, "[0, port, ['profile'], ['tags'], ['hidden']]");
+  service_msg =
+      Eval(lib, "[0, port, 'getCpuProfile', ['tags'], ['Bogus']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Expect error.
   EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 }
 
 #endif  // !defined(TARGET_ARCH_ARM64)
 
 }  // namespace dart