Finish moving service protocol to json rpc.

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 166 matching lines @@
   // 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 isolate summary.
-  service_msg = Eval(lib, "[0, port, [], [], []]");
+  service_msg = Eval(lib, "[0, port, 'getIsolate', [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
 
   JSONReader reader(handler.msg());
 
   const int kBufferSize = 128;
   char buffer[kBufferSize];
 
   // Check that the response string is somewhat sane.
 
@@ skipping 43 matching lines @@
     arr.SetAt(0, str);
   }
   intptr_t arr_id = ring->GetIdForObject(arr.raw());
   Dart_Handle valid_id = Dart_NewInteger(arr_id);
   EXPECT_VALID(valid_id);
   EXPECT_VALID(Dart_SetField(lib, NewString("validId"), valid_id));
 
   Array& service_msg = Array::Handle();
 
   // null
-  service_msg = Eval(lib, "[0, port, ['objects', 'null'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'getObject', "
+                     "['objectId'], ['objects/null']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("_vmName");
   EXPECT_SUBSTRING(
       "{\"type\":\"null\",\"id\":\"objects\\/null\","
       "\"valueAsString\":\"null\",\"class\":",
       handler.msg());
 
-  // not initialized
-  service_msg = Eval(lib, "[0, port, ['objects', 'not-initialized'], [], []]");
+  // bool
+  service_msg = Eval(lib, "[0, port, 'getObject', "
+                     "['objectId'], ['objects/bool-true']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("_vmName");
-  EXPECT_STREQ(
-      "{\"type\":\"Sentinel\",\"id\":\"objects\\/not-initialized\","
-      "\"valueAsString\":\"<not initialized>\"}",
-      handler.msg());
-
-  // being initialized
-  service_msg = Eval(lib,
-                     "[0, port, ['objects', 'being-initialized'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  handler.filterMsg("_vmName");
-  EXPECT_STREQ(
-      "{\"type\":\"Sentinel\",\"id\":\"objects\\/being-initialized\","
-      "\"valueAsString\":\"<being initialized>\"}",
-      handler.msg());
-
-  // optimized out
-  service_msg = Eval(lib, "[0, port, ['objects', 'optimized-out'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  handler.filterMsg("_vmName");
-  EXPECT_STREQ(
-      "{\"type\":\"Sentinel\",\"id\":\"objects\\/optimized-out\","
-      "\"valueAsString\":\"<optimized out>\"}",
-      handler.msg());
-
-  // collected
-  service_msg = Eval(lib, "[0, port, ['objects', 'collected'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  handler.filterMsg("_vmName");
-  EXPECT_STREQ(
-      "{\"type\":\"Sentinel\",\"id\":\"objects\\/collected\","
-      "\"valueAsString\":\"<collected>\"}",
-      handler.msg());
-
-  // expired
-  service_msg = Eval(lib, "[0, port, ['objects', 'expired'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  handler.filterMsg("_vmName");
-  EXPECT_STREQ(
-      "{\"type\":\"Sentinel\",\"id\":\"objects\\/expired\","
-      "\"valueAsString\":\"<expired>\"}",
-      handler.msg());
-
-  // bool
-  service_msg = Eval(lib, "[0, port, ['objects', 'bool-true'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  handler.filterMsg("_vmName");
   handler.filterMsg("size");
   EXPECT_STREQ(
       "{\"type\":\"bool\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/46\","
       "\"name\":\"bool\"},"
       "\"fields\":[],\"id\":\"objects\\/bool-true\","
       "\"valueAsString\":\"true\"}",
       handler.msg());
 
   // int
-  service_msg = Eval(lib, "[0, port, ['objects', 'int-123'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'getObject', "
+                     "['objectId'], ['objects/int-123']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("_vmName");
   EXPECT_STREQ(
       "{\"type\":\"int\",\"_vmType\":\"Smi\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
       "\"name\":\"_Smi\",},"
       "\"fields\":[],"
       "\"id\":\"objects\\/int-123\","
       "\"valueAsString\":\"123\"}",
       handler.msg());
 
   // object id ring / valid
-  service_msg = Eval(lib, "[0, port, ['objects', '$validId'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'getObject', "
+                     "['objectId'], ['objects/$validId']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("_vmName");
   handler.filterMsg("size");
   handler.filterMsg("id");
   EXPECT_STREQ(
       "{\"type\":\"List\",\"_vmType\":\"Array\","
       "\"class\":{\"type\":\"@Class\",\"name\":\"_List\",},"
       "\"fields\":[],"
       "\"length\":1,"
       "\"elements\":[{"
           "\"index\":0,"
           "\"value\":{\"type\":\"@String\","
           "\"class\":{\"type\":\"@Class\",\"name\":\"_OneByteString\",},"
           "\"valueAsString\":\"value\"}}]}",
       handler.msg());
 
   // object id ring / invalid => expired
-  service_msg = Eval(lib, "[0, port, ['objects', '99999999'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'getObject', "
+                     "['objectId'], ['objects/99999999']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("_vmName");
   EXPECT_STREQ(
       "{\"type\":\"Sentinel\",\"id\":\"objects\\/expired\","
       "\"valueAsString\":\"<expired>\"}",
       handler.msg());
 
   // Retained by single instance.
   service_msg = Eval(
@@ skipping 164 matching lines @@
   // 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();
 
   // Request library.
-  service_msg = EvalF(lib,
-                      "[0, port, ['libraries', '%" Pd "'], [], []]",
-                      vmlib.index());
+  service_msg =
+      EvalF(lib,
+            "[0, port, 'getObject', ['objectId'], ['libraries/%" Pd "']]",
+            vmlib.index());
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Library\"", handler.msg());
   EXPECT_SUBSTRING("\"url\":\"test-lib\"", handler.msg());
 }
 
 
 TEST_CASE(Service_Classes) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
@@ skipping 30 matching lines @@
   // 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();
 
   // Request an invalid class id.
-  service_msg = Eval(lib, "[0, port, ['classes', '999999'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'getObject', "
+                     "['objectId'], ['classes/999999']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  EXPECT_STREQ(
-    "{\"type\":\"Error\","
-    "\"message\":\"999999 is not a valid class id.\","
-    "\"request\":{\"arguments\":[\"classes\",\"999999\"],"
-    "\"option_keys\":[],\"option_values\":[]}}", handler.msg());
+  EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // Request the class A over the service.
-  service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "'], [], []]", cid);
+  service_msg = EvalF(lib, "[0, port, 'getObject', "
+                      "['objectId'], ['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\":");
 
   // Request function 'b' from class A.
   service_msg = EvalF(lib,
-                      "[0, port, ['classes', '%" Pd "', 'functions', 'b'],"
-                      "[], []]", cid);
+                      "[0, port, 'getObject', "
+                      "['objectId'], ['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_msg = EvalF(lib, "[0, port, 'getObject', "
+                      "['objectId'], ['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_msg = EvalF(lib, "[0, port, 'getObject', "
+                      "['objectId'], ['classes/%" Pd "/huh']]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"message\":\"Invalid sub collection huh\""
-    ",\"request\":"
-    "{\"arguments\":[\"classes\",\"%" Pd "\",\"huh\",\"0\"],\"option_keys\":[],"
-    "\"option_values\":[]}}", cid);
+  EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // Invalid field request.
-  service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "', 'fields', '9'],"
-                      "[], []]", cid);
+  service_msg = EvalF(lib, "[0, port, 'getObject', "
+                      "['objectId'], ['classes/%" Pd "/fields/9']]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"message\":\"Field 9 not found\","
-    "\"request\":{\"arguments\":[\"classes\",\"%" Pd "\",\"fields\",\"9\"],"
-    "\"option_keys\":[],\"option_values\":[]}}", cid);
+  EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // Invalid function request.
   service_msg = EvalF(lib,
-                      "[0, port, ['classes', '%" Pd "', 'functions', '9'],"
-                      "[], []]", cid);
+                      "[0, port, 'getObject', "
+                      "['objectId'], ['classes/%" Pd "/functions/9']]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"message\":\"Function 9 not found\","
-    "\"request\":{\"arguments\":[\"classes\",\"%" Pd "\",\"functions\",\"9\"],"
-    "\"option_keys\":[],\"option_values\":[]}}", cid);
-
+  EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // Invalid field subcommand.
   service_msg = EvalF(lib,
-                      "[0, port, ['classes', '%" Pd "', 'fields', '9', 'x']"
-                      ",[], []]", cid);
+                      "[0, port, 'getObject', "
+                      "['objectId'], ['classes/%" Pd "/fields/9']]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"message\":\"Command too long\","
-    "\"request\":"
-    "{\"arguments\":[\"classes\",\"%" Pd "\",\"fields\",\"9\",\"x\"],"
-    "\"option_keys\":[],\"option_values\":[]}}", cid);
+  EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // Invalid function command.
   service_msg = EvalF(lib,
-                      "[0, port, ['classes', '%" Pd "', 'functions', '0',"
-                      "'x', 'y'], [], []]", cid);
+                      "[0, port, 'getObject', "
+                      "['objectId'], ['classes/%" Pd "/functions/0/x/y']]",
+                      cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\","
-    "\"message\":\"Command should have 4 or 5 arguments\","
-    "\"request\":"
-    "{\"arguments\":[\"classes\",\"%" Pd "\",\"functions\",\"0\",\"x\",\"y\"],"
-    "\"option_keys\":[],\"option_values\":[]}}", cid);
+  EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // Invalid function subcommand with valid function id.
   service_msg = EvalF(lib,
-                      "[0, port, ['classes', '%" Pd "', 'functions', 'b',"
-                      "'x'], [], []]", cid);
+                      "[0, port, 'getObject', "
+                      "['objectId'], ['classes/%" Pd "/functions/b/x']]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\",\"message\":\"Invalid sub command x\","
-    "\"request\":"
-    "{\"arguments\":[\"classes\",\"%" Pd "\",\"functions\",\"b\",\"x\"],"
-    "\"option_keys\":[],\"option_values\":[]}}", cid);
+  EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // 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, 'getRetainedSize', "
                       "['targetId'], ['classes/%" Pd "']]", class_b.id());
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
@@ skipping 24 matching lines @@
   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++.
-      "\n"
-      "class A {\n"
-      "  a() { return 1; }\n"
-      "  b() { return 0; }\n"
-      "  c(String f) { return f.length; }\n"
-      "}\n"
-      "main() {\n"
-      "  var z = new A();\n"
-      "  return z.a();\n"
-      "}\n"
-      "runB() {\n"
-      "  var z = new A();\n"
-      "  return z.b();\n"
-      "}\n"
-      "runC() {\n"
-      "  var z = new A();\n"
-      "  return z.c();\n"
-      "}\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);
-  const Class& class_a = Class::Handle(GetClass(vmlib, "A"));
-  EXPECT(!class_a.IsNull());
-  intptr_t cid = class_a.id();
-
-  // 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();
-
-  // 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\":");
-
-  // 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);
-
-  // Invalid set source of function 'b' from class A.
-  service_msg = EvalF(
-    lib,
-    "[0, port, ['classes', '%" Pd "', 'functions', 'b', 'set_source'],"
-    "[], []]", cid);
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
-  EXPECT_SUBSTRING("set_source expects a 'source' option", handler.msg());
-
-  // Set source (with syntax error) of function 'b' from class A.
-  service_msg = EvalF(
-    lib,
-    "[0, port, ['classes', '%" Pd "', 'functions', 'b', 'set_source'],"
-    "['source'], ['b() { return 4 }']]", cid);
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
-
-  // Set source of function 'b' from class A.
-  service_msg = EvalF(
-    lib,
-    "[0, port, ['classes', '%" Pd "', 'functions', 'b', 'set_source'],"
-    "['source'], ['b() { return 4; }']]", cid);
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  EXPECT_SUBSTRING("Success", handler.msg());
-
-  // Run function 'b' see that it is executing replaced code.
-  result = Dart_Invoke(lib, NewString("runB"), 0, NULL);
-  EXPECT_VALID(result);
-  ASSERT(Dart_IsInteger(result));
-  int64_t r;
-  result = Dart_IntegerToInt64(result, &r);
-  EXPECT_VALID(result);
-  EXPECT_EQ(4, r);
-
-  // Set source of function 'c' from class A, changing its signature.
-  service_msg = EvalF(
-    lib,
-    "[0, port, ['classes', '%" Pd "', 'functions', 'c', 'set_source'],"
-    "['source'], ['c() { return 99; }']]", cid);
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  EXPECT_SUBSTRING("Success", handler.msg());
-
-  // Run function 'c' see that it is executing replaced code.
-  result = Dart_Invoke(lib, NewString("runC"), 0, NULL);
-  EXPECT_VALID(result);
-  ASSERT(Dart_IsInteger(result));
-  result = Dart_IntegerToInt64(result, &r);
-  EXPECT_VALID(result);
-  EXPECT_EQ(99, r);
-}
-
-
 TEST_CASE(Service_Types) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "class A<T> { }\n"
       "\n"
       "main() {\n"
       "  new A<A<bool>>();\n"
       "}";
 
@@ skipping 12 matching lines @@
   // 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();
 
   // Request the class A over the service.
-  service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "'], [], []]", cid);
+  service_msg = EvalF(lib, "[0, port, 'getObject', "
+                      "['objectId'], ['classes/%" Pd "']]]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Class\"", handler.msg());
   EXPECT_SUBSTRING("\"name\":\"A\"", handler.msg());
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\"", cid);
 
   // Request canonical type 0 from class A.
-  service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "', 'types', '0'],"
-                              "[], []]", cid);
+  service_msg = EvalF(lib, "[0, port, 'getObject', "
+                      "['objectId'], ['classes/%" Pd "/types/0']]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Type\"", handler.msg());
   EXPECT_SUBSTRING("\"name\":\"A<bool>\"", handler.msg());
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\\/types\\/0\"", cid);
 
   // Request canonical type 1 from class A.
-  service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "', 'types', '1'],"
-                              "[], []]", cid);
+  service_msg = EvalF(lib, "[0, port, 'getObject', "
+                      "['objectId'], ['classes/%" Pd "/types/1']]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Type\"", handler.msg());
   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_msg = EvalF(lib, "[0, port, 'getObject', "
+                      "['objectId'], ['classes/%" Pd "/types/42']]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  ExpectSubstringF(handler.msg(),
-    "{\"type\":\"Error\","
-    "\"message\":\"Canonical type 42 not found\""
-    ",\"request\":"
-    "{\"arguments\":[\"classes\",\"%" Pd "\",\"types\",\"42\"],"
-    "\"option_keys\":[],\"option_values\":[]}}", cid);
+  EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 }
 
 
 TEST_CASE(Service_Code) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "class A {\n"
       "  var a;\n"
       "  dynamic b() {}\n"
@@ skipping 31 matching lines @@
   // 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();
 
   // Request an invalid code object.
-  service_msg = Eval(lib, "[0, port, ['code', '0'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'getObject', ['objectId'], ['code/0']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  EXPECT_STREQ(
-    "{\"type\":\"Error\",\"message\":\"Malformed code id: 0\","
-    "\"request\":{\"arguments\":[\"code\",\"0\"],"
-    "\"option_keys\":[],\"option_values\":[]}}", handler.msg());
+  EXPECT_SUBSTRING("\"type\":\"Error\"", 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 "'], [], []]",
+  service_msg = EvalF(lib, "[0, port, 'getObject', "
+                      "['objectId'], ['code/%" Px64"-%" Px "']]",
                       compile_timestamp,
                       entry);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   {
     // Only perform a partial match.
     const intptr_t kBufferSize = 512;
     char buffer[kBufferSize];
     OS::SNPrint(buffer, kBufferSize-1,
                 "{\"type\":\"Code\",\"id\":\"code\\/%" Px64 "-%" Px "\",",
                 compile_timestamp,
                 entry);
     EXPECT_SUBSTRING(buffer, handler.msg());
   }
 
   // Request code object at compile_timestamp-code.EntryPoint() + 16
   // Expect this to fail because the address is not the entry point.
   uintptr_t address = entry + 16;
-  service_msg = EvalF(lib, "[0, port, ['code', '%" Px64"-%" Px "'], [], []]",
+  service_msg = EvalF(lib, "[0, port, 'getObject', "
+                      "['objectId'], ['code/%" Px64"-%" Px "']]",
                       compile_timestamp,
                       address);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  {
-    // Only perform a partial match.
-    const intptr_t kBufferSize = 512;
-    char buffer[kBufferSize];
-    OS::SNPrint(buffer, kBufferSize-1,
-                "Could not find code with id: %" Px64 "-%" Px "",
-                compile_timestamp,
-                address);
-    EXPECT_SUBSTRING(buffer, handler.msg());
-  }
+  EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // Request code object at (compile_timestamp - 1)-code.EntryPoint()
   // Expect this to fail because the timestamp is wrong.
   address = entry;
-  service_msg = EvalF(lib, "[0, port, ['code', '%" Px64"-%" Px "'], [], []]",
+  service_msg = EvalF(lib, "[0, port, 'getObject', "
+                      "['objectId'], ['code/%" Px64"-%" Px "']]",
                       compile_timestamp - 1,
                       address);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  {
-    // Only perform a partial match.
-    const intptr_t kBufferSize = 512;
-    char buffer[kBufferSize];
-    OS::SNPrint(buffer, kBufferSize-1,
-                "Could not find code with id: %" Px64 "-%" Px "",
-                compile_timestamp - 1,
-                address);
-    EXPECT_SUBSTRING(buffer, handler.msg());
-  }
+  EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // Request native code at address. Expect the null code object back.
   address = last;
-  service_msg = EvalF(lib, "[0, port, ['code', 'native-%" Px "'], [], []]",
+  service_msg = EvalF(lib, "[0, port, 'getObject', "
+                      "['objectId'], ['code/native-%" Px "']]",
                       address);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("{\"type\":\"null\",\"id\":\"objects\\/null\","
                    "\"valueAsString\":\"null\"",
                    handler.msg());
 
   // Request malformed native code.
-  service_msg = EvalF(lib, "[0, port, ['code', 'native%" Px "'], [], []]",
+  service_msg = EvalF(lib, "[0, port, 'getObject', ['objectId'], "
+                      "['code/native%" Px "']]",
                       address);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
-  EXPECT_SUBSTRING("\"message\":\"Malformed code id:", handler.msg());
+  EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 }
 
 
 TEST_CASE(Service_TokenStream) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "main() {\n"
       "}";
 
@@ skipping 18 matching lines @@
   // 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();
 
   // Fetch object.
-  service_msg = EvalF(lib, "[0, port, ['objects', '%" Pd "'], [], []]", id);
+  service_msg = EvalF(lib, "[0, port, 'getObject', "
+                      "['objectId'], ['objects/%" Pd "']]", id);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
 
   // Check type.
   EXPECT_SUBSTRING("\"type\":\"Object\"", handler.msg());
   EXPECT_SUBSTRING("\"_vmType\":\"TokenStream\"", handler.msg());
   // Check for members array.
   EXPECT_SUBSTRING("\"members\":[", handler.msg());
 }
 
@@ skipping 40 matching lines @@
   // 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();
 
   // Fetch object.
-  service_msg = EvalF(lib, "[0, port, ['objects', '%" Pd "'], [], []]", id);
+  service_msg = EvalF(lib, "[0, port, 'getObject', "
+                      "['objectId'], ['objects/%" Pd "']]", id);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Check type.
   EXPECT_SUBSTRING("\"type\":\"Object\"", handler.msg());
   EXPECT_SUBSTRING("\"_vmType\":\"PcDescriptors\"", handler.msg());
   // Check for members array.
   EXPECT_SUBSTRING("\"members\":[", handler.msg());
 }
 
 
@@ skipping 39 matching lines @@
   // 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();
 
   // Fetch object.
-  service_msg = EvalF(lib, "[0, port, ['objects', '%" Pd "'], [], []]", id);
+  service_msg = EvalF(lib, "[0, port, 'getObject', "
+                      "['objectId'], ['objects/%" Pd "']]", id);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Check type.
   EXPECT_SUBSTRING("\"type\":\"Object\"", handler.msg());
   EXPECT_SUBSTRING("\"_vmType\":\"LocalVarDescriptors\"", handler.msg());
   // Check for members array.
   EXPECT_SUBSTRING("\"members\":[", handler.msg());
 }
 
 
 TEST_CASE(Service_VM) {
   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, ['vm'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'getVM', [], []]");
 
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"VM\",\"id\":\"vm\"", handler.msg());
   EXPECT_SUBSTRING("\"targetCPU\"", handler.msg());
   EXPECT_SUBSTRING("\"hostCPU\"", handler.msg());
   EXPECT_SUBSTRING("\"version\"", handler.msg());
   EXPECT_SUBSTRING("\"uptime\"", handler.msg());
   EXPECT_SUBSTRING("\"isolates\"", handler.msg());
 }
@@ skipping 11 matching lines @@
   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, ['flags'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'getFlagList', [], []]");
 
   // Make sure we can get the FlagList.
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"FlagList\",\"id\":\"flags\"", handler.msg());
   EXPECT_SUBSTRING(
       "\"name\":\"service_testing_flag\",\"comment\":\"Comment\","
       "\"flagType\":\"bool\",\"valueAsString\":\"false\"",
       handler.msg());
 
   // Modify a flag through the vm service.
   service_msg = Eval(lib,
-                     "[0, port, ['flags', 'set'], "
+                     "[0, port, 'setFlag', "
                      "['name', 'value'], ['service_testing_flag', 'true']]");
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("Success", handler.msg());
 
   // Make sure that the flag changed.
-  service_msg = Eval(lib, "[0, port, ['flags'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'getFlagList', [], []]");
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING(
       "\"name\":\"service_testing_flag\",\"comment\":\"Comment\","
       "\"flagType\":\"bool\",\"valueAsString\":\"true\"",
       handler.msg());
 }
 
 
 TEST_CASE(Service_Scripts) {
@@ skipping 13 matching lines @@
   // 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'], [], []]",
-      vmlib.index());
+              "[0, port, 'getObject', "
+              "['objectId'], ['libraries/%" Pd "/scripts/test-lib']]",
+              vmlib.index());
 
   service_msg = Eval(lib, buf);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   OS::SNPrint(buf, sizeof(buf),
       "{\"type\":\"Script\","
       "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
       "\"name\":\"test-lib\","
       "\"kind\":\"script\","
       "\"owningLibrary\":{\"type\":\"@Library\","
@@ skipping 122 matching lines @@
   const String& str = String::Handle(String::New("foobar", Heap::kOld));
   Array& service_msg = Array::Handle();
   // Note: If we ever introduce old space compaction, this test might fail.
   uword start_addr = RawObject::ToAddr(str.raw());
   // Expect to find 'str', also from internal addresses.
   for (int offset = 0; offset < kObjectAlignment; ++offset) {
     uword addr = start_addr + offset;
     char buf[1024];
     bool ref = offset % 2 == 0;
     OS::SNPrint(buf, sizeof(buf),
-                ref ? "[0, port, ['address', '%" Px "'], ['ref'], ['true']]" :
-                      "[0, port, ['address', '%" Px "', ], [], []]",
+                (ref
+                 ? "[0, port, 'getObjectByAddress', "
+                   "['address', 'ref'], ['%" Px "', 'true']]"
+                 : "[0, port, 'getObjectByAddress', "
+                   "['address'], ['%" Px "']]"),
                 addr);
     service_msg = Eval(lib, buf);
     Service::HandleIsolateMessage(isolate, service_msg);
     handler.HandleNextMessage();
     EXPECT_SUBSTRING(ref ? "\"type\":\"@String\"" :
                            "\"type\":\"String\"",
                      handler.msg());
     EXPECT_SUBSTRING("foobar", handler.msg());
   }
   // Expect null when no object is found.
-  service_msg = Eval(lib, "[0, port, ['address', '7'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'getObjectByAddress', "
+                     "['address'], ['7']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // TODO(turnidge): Should this be a ServiceException instead?
   EXPECT_SUBSTRING("{\"type\":\"null\",\"id\":\"objects\\/null\","
                    "\"valueAsString\":\"null\"",
                handler.msg());
 }
 
 
 static const char* alpha_callback(
     const char* name,
-    const char** arguments,
-    intptr_t num_arguments,
     const char** option_keys,
     const char** option_values,
     intptr_t num_options,
     void* user_data) {
   return strdup("alpha");
 }
 
 
 static const char* beta_callback(
     const char* name,
-    const char** arguments,
-    intptr_t num_arguments,
     const char** option_keys,
     const char** option_values,
     intptr_t num_options,
     void* user_data) {
   return strdup("beta");
 }
 
 
 TEST_CASE(Service_EmbedderRootHandler) {
   const char* kScript =
@@ skipping 16 matching lines @@
 
   // 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, ['alpha'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'alpha', [], []]");
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("alpha", handler.msg());
-  service_msg = Eval(lib, "[0, port, ['beta'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'beta', [], []]");
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("beta", handler.msg());
 }
 
 TEST_CASE(Service_EmbedderIsolateHandler) {
   const char* kScript =
     "var port;\n"  // Set to our mock port by C++.
     "\n"
     "var x = 7;\n"
@@ skipping 12 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, ['alpha'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'alpha', [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("alpha", handler.msg());
-  service_msg = Eval(lib, "[0, port, ['beta'], [], []]");
+  service_msg = Eval(lib, "[0, port, 'beta', [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("beta", handler.msg());
 }
 
 
 // TODO(zra): Remove when tests are ready to enable.
 #if !defined(TARGET_ARCH_ARM64)
 
 TEST_CASE(Service_Profile) {
@@ skipping 37 matching lines @@
       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