Add breakpoints and single-stepping to Observatory.

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 107 matching lines @@
   char* buffer = isolate->current_zone()->Alloc<char>(len + 1);
   va_list args2;
   va_start(args2, fmt);
   OS::VSNPrint(buffer, (len + 1), fmt, args2);
   va_end(args2);
 
   return Eval(lib, buffer);
 }
 
 
-// Search for the formatted string in buff.
+// Search for the formatted string in buffer.
 //
 // TODO(turnidge): This function obscures the line number of failing
 // EXPECTs.  Rework this.
 static void ExpectSubstringF(const char* buff, const char* fmt, ...) {
   Isolate* isolate = Isolate::Current();
 
   va_list args;
   va_start(args, fmt);
   intptr_t len = OS::VSNPrint(NULL, 0, fmt, args);
   va_end(args);
@@ skipping 118 matching lines @@
 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.
-  const String& url = String::Handle(String::New(TestCase::url()));
-  isolate->debugger()->SetBreakpointAtLine(url, 3);
+  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\",\"user_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\",\"user_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\",\"user_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\",\"breakpoints\":[{"
-          "\"type\":\"Breakpoint\",\"id\":1,\"enabled\":true,"
-          "\"resolved\":false,"
-          "\"location\":{\"type\":\"Location\","
-                        "\"script\":\"test-lib\",\"tokenPos\":5}}]}",
-      handler.msg());
-
-  // Individual breakpoint.
-  service_msg = Eval(lib, "[0, port, ['debug', 'breakpoints', '1'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  EXPECT_STREQ(
-      "{\"type\":\"Breakpoint\",\"id\":1,\"enabled\":true,"
-       "\"resolved\":false,"
-       "\"location\":{\"type\":\"Location\","
-                     "\"script\":\"test-lib\",\"tokenPos\":5}}",
+      "{\"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\","
+                "\"message\":\"Unrecognized breakpoint id: 1111\","
                 "\"request\":{"
                     "\"arguments\":[\"debug\",\"breakpoints\",\"1111\"],"
                     "\"option_keys\":[],\"option_values\":[]}}",
                handler.msg());
 
-  // Command too long.
-  service_msg =
-      Eval(lib, "[0, port, ['debug', 'breakpoints', '1111', 'green'], [], []]");
-  Service::HandleIsolateMessage(isolate, service_msg);
-  handler.HandleNextMessage();
-  EXPECT_STREQ("{\"type\":\"Error\",\"id\":\"\","
-                "\"message\":\"Command too long\","
-                "\"request\":{\"arguments\":[\"debug\",\"breakpoints\","
-                                            "\"1111\",\"green\"],"
-                             "\"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\",\"user_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 257 matching lines @@
       "  String f0;\n"
       "  String f1;\n"
       "}\n"
       "Foo foo;\n"
       "List<String> lst;\n"
       "main() {\n"
       "  foo = new Foo();\n"
       "  lst = new List<String>(100);\n"
       "}\n";
   Isolate* isolate = Isolate::Current();
-  Dart_Handle h_lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(h_lib);
-  Library& lib = Library::Handle();
-  lib ^= Api::UnwrapHandle(h_lib);
-  EXPECT(!lib.IsNull());
-  Dart_Handle result = Dart_Invoke(h_lib, NewString("main"), 0, NULL);
+  Dart_Handle lib = TestCase::LoadTestScript(kScript, NULL);
+  EXPECT_VALID(lib);
+  Dart_Handle result = Dart_Invoke(lib, NewString("main"), 0, NULL);
   EXPECT_VALID(result);
-  const Class& class_foo = Class::Handle(GetClass(lib, "Foo"));
+  Library& vmlib = Library::Handle();
+  vmlib ^= Api::UnwrapHandle(lib);
+  EXPECT(!vmlib.IsNull());
+  const Class& class_foo = Class::Handle(GetClass(vmlib, "Foo"));
   EXPECT(!class_foo.IsNull());
-  Dart_Handle foo = Dart_GetField(h_lib, NewString("foo"));
-  Dart_Handle lst = Dart_GetField(h_lib, NewString("lst"));
+  Dart_Handle foo = Dart_GetField(lib, NewString("foo"));
+  Dart_Handle lst = Dart_GetField(lib, NewString("lst"));
   const intptr_t kElemIndex = 42;
   {
     Dart_EnterScope();
     ObjectIdRing* ring = isolate->object_id_ring();
     {
       const String& foo0 = String::Handle(String::New("foo0", Heap::kOld));
       Dart_Handle h_foo0 = Api::NewHandle(isolate, foo0.raw());
       EXPECT_VALID(Dart_SetField(foo, NewString("f0"), h_foo0));
       Dart_Handle id0 = Dart_NewInteger(ring->GetIdForObject(foo0.raw()));
       EXPECT_VALID(id0);
-      EXPECT_VALID(Dart_SetField(h_lib, NewString("id0"), id0));
+      EXPECT_VALID(Dart_SetField(lib, NewString("id0"), id0));
     }
     {
       const String& foo1 = String::Handle(String::New("foo1", Heap::kOld));
       Dart_Handle h_foo1 = Api::NewHandle(isolate, foo1.raw());
       EXPECT_VALID(Dart_SetField(foo, NewString("f1"), h_foo1));
       Dart_Handle id1 = Dart_NewInteger(ring->GetIdForObject(foo1.raw()));
       EXPECT_VALID(id1);
-      EXPECT_VALID(Dart_SetField(h_lib, NewString("id1"), id1));
+      EXPECT_VALID(Dart_SetField(lib, NewString("id1"), id1));
     }
     {
       const String& elem = String::Handle(String::New("elem", Heap::kOld));
       Dart_Handle h_elem = Api::NewHandle(isolate, elem.raw());
       EXPECT_VALID(Dart_ListSetAt(lst, kElemIndex, h_elem));
       Dart_Handle idElem = Dart_NewInteger(ring->GetIdForObject(elem.raw()));
       EXPECT_VALID(idElem);
-      EXPECT_VALID(Dart_SetField(h_lib, NewString("idElem"), idElem));
+      EXPECT_VALID(Dart_SetField(lib, NewString("idElem"), idElem));
     }
     Dart_ExitScope();
   }
 
   // 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(h_lib, NewString("port"), port));
+  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
   Array& service_msg = Array::Handle();
 
   // Retaining path to 'foo0', limit 2.
   service_msg = Eval(
-      h_lib,
+      lib,
       "[0, port, ['objects', '$id0', 'retaining_path'], ['limit'], ['2']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(
       handler.msg(),
       "{\"type\":\"RetainingPath\",\"id\":\"retaining_path\",\"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(
-      h_lib,
+      lib,
       "[0, port, ['objects', '$id1', 'retaining_path'], ['limit'], ['2']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(
       handler.msg(),
       "{\"type\":\"RetainingPath\",\"id\":\"retaining_path\",\"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(
-      h_lib,
+      lib,
       "[0, port, ['objects', '$idElem', 'retaining_path'], ['limit'], ['2']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(
       handler.msg(),
       "{\"type\":\"RetainingPath\",\"id\":\"retaining_path\",\"length\":2,"
       "\"elements\":[{\"index\":0,\"value\":{\"type\":\"@String\"");
   ExpectSubstringF(handler.msg(), "\"parentListIndex\":%" Pd, kElemIndex);
   ExpectSubstringF(handler.msg(),
       "{\"index\":1,\"value\":{\"type\":\"@Array\"");
 }
 
 
 TEST_CASE(Service_Libraries) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "var libVar = 54321;\n"
       "\n"
       "main() {\n"
       "}";
 
   Isolate* isolate = Isolate::Current();
-  Dart_Handle h_lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(h_lib);
-  Library& lib = Library::Handle();
-  lib ^= Api::UnwrapHandle(h_lib);
-  EXPECT(!lib.IsNull());
-
-  // Find the current library.
-  intptr_t lib_id = -1;
-  const GrowableObjectArray& libs =
-      GrowableObjectArray::Handle(isolate->object_store()->libraries());
-  for (intptr_t i = 0; i < libs.Length(); i++) {
-    if (libs.At(i) == lib.raw()) {
-      lib_id = i;
-    }
-  }
-  ASSERT(lib_id > 0);
+  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(h_lib, NewString("port"), port));
+  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Array& service_msg = Array::Handle();
 
   // Request library.
-  service_msg = EvalF(h_lib,
-                      "[0, port, ['libraries', '%" Pd "'], [], []]", lib_id);
+  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(h_lib,
+  service_msg = EvalF(lib,
                       "[0, port, ['libraries', '%" Pd "', 'eval'], "
-                      "['expr'], ['libVar - 1']]", lib_id);
+                      "['expr'], ['libVar - 1']]",
+                      vmlib.index());
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"@Smi\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
       "\"user_name\":\"_Smi\"},\"id\":\"objects\\/int-54320\","
       "\"valueAsString\":\"54320\"}",
       handler.msg());
 }
@@ skipping 14 matching lines @@
       "}\n"
       "class B { static int i = 42; }\n"
       "main() {\n"
       "  var z = new A();\n"
       "  var x = z.c();\n"
       "  x();\n"
       "  ++B.i;\n"
       "}";
 
   Isolate* isolate = Isolate::Current();
-  Dart_Handle h_lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(h_lib);
-  Library& lib = Library::Handle();
-  lib ^= Api::UnwrapHandle(h_lib);
-  EXPECT(!lib.IsNull());
-  Dart_Handle result = Dart_Invoke(h_lib, NewString("main"), 0, NULL);
+  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(lib, "A"));
+  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(h_lib, NewString("port"), port));
+  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Array& service_msg = Array::Handle();
 
   // Request an invalid class id.
-  service_msg = Eval(h_lib, "[0, port, ['classes', '999999'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['classes', '999999'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ(
     "{\"type\":\"Error\",\"id\":\"\","
     "\"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(h_lib, "[0, port, ['classes', '%" Pd "'], [], []]", cid);
+  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(h_lib,
+  service_msg = EvalF(lib,
                       "[0, port, ['classes', '%" Pd "', 'eval'], "
                       "['expr'], ['cobra + 100000']]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   handler.filterMsg("name");
   EXPECT_STREQ(
       "{\"type\":\"@Smi\","
       "\"class\":{\"type\":\"@Class\",\"id\":\"classes\\/42\","
       "\"user_name\":\"_Smi\"},"
       "\"id\":\"objects\\/int-111235\","
       "\"valueAsString\":\"111235\"}",
       handler.msg());
 
   // Request function 0 from class A.
-  service_msg = EvalF(h_lib,
+  service_msg = EvalF(lib,
                       "[0, port, ['classes', '%" Pd "', 'functions', '0'],"
                       "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Function\"", handler.msg());
   ExpectSubstringF(handler.msg(),
                    "\"id\":\"classes\\/%" Pd "\\/functions\\/0\","
                    "\"name\":\"get:a\",", cid);
 
   // Request field 0 from class A.
-  service_msg = EvalF(h_lib, "[0, port, ['classes', '%" Pd "', 'fields', '0'],"
-                              "[], []]", cid);
+  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(h_lib, "[0, port, ['classes', '%" Pd "', 'huh', '0'],"
-                              "[], []]", cid);
+  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\""
     ",\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"huh\",\"0\"],\"option_keys\":[],"
     "\"option_values\":[]}}", cid);
 
   // Invalid field request.
-  service_msg = EvalF(h_lib, "[0, port, ['classes', '%" Pd "', 'fields', '9'],"
-                              "[], []]", cid);
+  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\","
     "\"request\":{\"arguments\":[\"classes\",\"%" Pd "\",\"fields\",\"9\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
   // Invalid function request.
-  service_msg = EvalF(h_lib,
+  service_msg = EvalF(lib,
                       "[0, port, ['classes', '%" Pd "', 'functions', '9'],"
-                    "[], []]", cid);
+                      "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
     "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Function 9 not found\","
     "\"request\":{\"arguments\":[\"classes\",\"%" Pd "\",\"functions\",\"9\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
 
   // Invalid field subcommand.
-  service_msg = EvalF(h_lib,
+  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\","
     "\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"fields\",\"9\",\"x\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
   // Invalid function command.
-  service_msg = EvalF(h_lib,
+  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\":\"\",\"message\":\"Command too long\","
     "\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"functions\",\"0\",\"x\",\"y\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
   // Invalid function subcommand with valid function id.
-  service_msg = EvalF(h_lib,
+  service_msg = EvalF(lib,
                       "[0, port, ['classes', '%" Pd "', 'functions', '0',"
                       "'x'], [], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
     "{\"type\":\"Error\",\"id\":\"\",\"message\":\"Invalid sub collection x\","
     "\"request\":"
     "{\"arguments\":[\"classes\",\"%" Pd "\",\"functions\",\"0\",\"x\"],"
     "\"option_keys\":[],\"option_values\":[]}}", cid);
 
   // Retained size of all instances of class B.
-  const Class& class_b = Class::Handle(GetClass(lib, "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(h_lib, "[0, port, ['classes', '%" Pd "', 'retained'],"
+  service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "', 'retained'],"
                       "[], []]", 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(h_lib, "[0, port, ['classes', '%" Pd "', 'instances'],"
+  service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "', 'instances'],"
                       "['limit'], ['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();
   list ^= isolate->object_id_ring()->GetObjectForId(kInstanceListId);
   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(h_lib, "[0, port, ['classes', '%" Pd "', 'instances'],"
+  service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "', 'instances'],"
                       "['limit'], ['1']]", class_b.id());
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(), "\"totalCount\":2");
   ExpectSubstringF(handler.msg(), "\"sampleCount\":1");
 }
 
 
 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"
       "}";
 
   Isolate* isolate = Isolate::Current();
-  Dart_Handle h_lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(h_lib);
-  Library& lib = Library::Handle();
-  lib ^= Api::UnwrapHandle(h_lib);
-  EXPECT(!lib.IsNull());
-  Dart_Handle result = Dart_Invoke(h_lib, NewString("main"), 0, NULL);
+  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(lib, "A"));
+  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(h_lib, NewString("port"), port));
+  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Array& service_msg = Array::Handle();
 
   // Request the class A over the service.
-  service_msg = EvalF(h_lib, "[0, port, ['classes', '%" Pd "'], [], []]", cid);
+  service_msg = EvalF(lib, "[0, port, ['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(h_lib, "[0, port, ['classes', '%" Pd "', 'types', '0'],"
+  service_msg = EvalF(lib, "[0, port, ['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(h_lib, "[0, port, ['classes', '%" Pd "', 'types', '1'],"
+  service_msg = EvalF(lib, "[0, port, ['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(h_lib, "[0, port, ['classes', '%" Pd "', 'types', '42'],"
-                              "[], []]", cid);
+  service_msg = EvalF(lib, "[0, port, ['classes', '%" Pd "', 'types', '42'],"
+                      "[], []]", cid);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   ExpectSubstringF(handler.msg(),
     "{\"type\":\"Error\",\"id\":\"\","
     "\"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(h_lib, "[0, port, ['typearguments'],"
-                              "[], []]");
+  service_msg = EvalF(lib, "[0, port, ['typearguments'],"
+                      "[], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"TypeArgumentsList\"", handler.msg());
   ExpectSubstringF(handler.msg(), "\"name\":\"<A<bool>>\",");
 
   // Request canonical type arguments with instantiations.
-  service_msg = EvalF(h_lib,
+  service_msg = EvalF(lib,
                       "[0, port, ['typearguments', 'withinstantiations'],"
                       "[], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"TypeArgumentsList\"", 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"
       "  dynamic c() {\n"
       "    var d = () { b(); };\n"
       "    return d;\n"
       "  }\n"
       "}\n"
       "main() {\n"
       "  var z = new A();\n"
       "  var x = z.c();\n"
       "  x();\n"
       "}";
 
   Isolate* isolate = Isolate::Current();
-  Dart_Handle h_lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(h_lib);
-  Library& lib = Library::Handle();
-  lib ^= Api::UnwrapHandle(h_lib);
-  EXPECT(!lib.IsNull());
-  Dart_Handle result = Dart_Invoke(h_lib, NewString("main"), 0, NULL);
+  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(lib, "A"));
+  const Class& class_a = Class::Handle(GetClass(vmlib, "A"));
   EXPECT(!class_a.IsNull());
   const Function& function_c = Function::Handle(GetFunction(class_a, "c"));
   EXPECT(!function_c.IsNull());
   const Code& code_c = Code::Handle(function_c.CurrentCode());
   EXPECT(!code_c.IsNull());
   // Use the entry of the code object as it's reference.
   uword entry = code_c.EntryPoint();
   int64_t compile_timestamp = code_c.compile_timestamp();
   EXPECT_GT(code_c.Size(), 16);
   uword last = entry + code_c.Size();
 
   // 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(h_lib, NewString("port"), port));
+  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Array& service_msg = Array::Handle();
 
   // Request an invalid code object.
-  service_msg = Eval(h_lib, "[0, port, ['code', '0'], [], []]");
+  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\","
     "\"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(h_lib, "[0, port, ['code', '%" Px64"-%" Px "'], [], []]",
+  service_msg = EvalF(lib, "[0, port, ['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(h_lib, "[0, port, ['code', '%" Px64"-%" Px "'], [], []]",
+  service_msg = EvalF(lib, "[0, port, ['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());
   }
 
   // Request code object at (compile_timestamp - 1)-code.EntryPoint()
   // Expect this to fail because the timestamp is wrong.
   address = entry;
-  service_msg = EvalF(h_lib, "[0, port, ['code', '%" Px64"-%" Px "'], [], []]",
+  service_msg = EvalF(lib, "[0, port, ['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());
   }
 
   // Request native code at address. Expect the null code object back.
   address = last;
-  service_msg = EvalF(h_lib, "[0, port, ['code', 'native-%" Px "'], [], []]",
+  service_msg = EvalF(lib, "[0, port, ['code', 'native-%" Px "'], [], []]",
                       address);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_STREQ("{\"type\":\"Null\",\"id\":\"objects\\/null\","
                "\"valueAsString\":\"null\"}",
                handler.msg());
 
   // Request malformed native code.
-  service_msg = EvalF(h_lib, "[0, port, ['code', 'native%" Px "'], [], []]",
+  service_msg = EvalF(lib, "[0, port, ['code', 'native%" Px "'], [], []]",
                       address);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"message\":\"Malformed code id:", handler.msg());
 }
 
 
 TEST_CASE(Service_VM) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
@@ skipping 76 matching lines @@
 
 
 TEST_CASE(Service_Scripts) {
   const char* kScript =
       "var port;\n"  // Set to our mock port by C++.
       "\n"
       "main() {\n"
       "}";
 
   Isolate* isolate = Isolate::Current();
-  Dart_Handle h_lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(h_lib);
-  Library& lib = Library::Handle();
-  lib ^= Api::UnwrapHandle(h_lib);
-  EXPECT(!lib.IsNull());
+  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(h_lib, NewString("port"), 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'], [], []]",
-      lib.index());
+      vmlib.index());
 
-  service_msg = Eval(h_lib, buf);
+  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\",\"user_name\":\"test-lib\","
       "\"kind\":\"script\","
       "\"owning_library\":{\"type\":\"@Library\","
       "\"id\":\"libraries\\/%" Pd "\",\"user_name\":\"\",\"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]]}",
-      lib.index(), lib.index());
+      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 h_lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(h_lib);
-  Library& lib = Library::Handle();
-  lib ^= Api::UnwrapHandle(h_lib);
-  EXPECT(!lib.IsNull());
-  Dart_Handle result = Dart_Invoke(h_lib, NewString("main"), 0, NULL);
+  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(h_lib, NewString("port"), port));
+  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Array& service_msg = Array::Handle();
-  service_msg = Eval(h_lib, "[0, port, ['coverage'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['coverage'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
 
-  // Look up the service id for the library containg the test-lib script.
-  const GrowableObjectArray& libs =
-      GrowableObjectArray::Handle(isolate->object_store()->libraries());
-  intptr_t i;
-  for (i = 0; i < libs.Length(); i++) {
-    if (libs.At(i) == lib.raw()) {
-      break;
-    }
-  }
-  ASSERT(i != libs.Length());
-
   char buf[1024];
   OS::SNPrint(buf, sizeof(buf),
-      "{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
-      "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
-      "\"name\":\"test-lib\",\"user_name\":\"test-lib\","
-      "\"kind\":\"script\"},\"hits\":"
-      "[5,1,6,1]}", i);
+              "{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
+              "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
+              "\"name\":\"test-lib\",\"user_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 h_lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(h_lib);
-  Library& lib = Library::Handle();
-  lib ^= Api::UnwrapHandle(h_lib);
-  EXPECT(!lib.IsNull());
-  Dart_Handle result = Dart_Invoke(h_lib, NewString("main"), 0, NULL);
+  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(h_lib, NewString("port"), 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'], "
       "[], []]",
-      lib.index());
+      vmlib.index());
 
-  service_msg = Eval(h_lib, buf);
+  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\",\"user_name\":\"test-lib\","
-      "\"kind\":\"script\"},\"hits\":[5,1,6,1]}]}", lib.index());
+      "\"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 h_lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(h_lib);
-  Library& lib = Library::Handle();
-  lib ^= Api::UnwrapHandle(h_lib);
-  EXPECT(!lib.IsNull());
-  Dart_Handle result = Dart_Invoke(h_lib, NewString("main"), 0, NULL);
+  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(h_lib, NewString("port"), port));
+  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
-  // Look up the service id for the library containg the test-lib script.
-  const GrowableObjectArray& libs =
-      GrowableObjectArray::Handle(isolate->object_store()->libraries());
-  intptr_t i;
-  for (i = 0; i < libs.Length(); i++) {
-    if (libs.At(i) == lib.raw()) {
-      break;
-    }
-  }
-  ASSERT(i != libs.Length());
   char buf[1024];
   OS::SNPrint(buf, sizeof(buf),
-              "[0, port, ['libraries', '%" Pd "', 'coverage'], [], []]", i);
+              "[0, port, ['libraries', '%" Pd "', 'coverage'], [], []]",
+              vmlib.index());
 
   Array& service_msg = Array::Handle();
-  service_msg = Eval(h_lib, buf);
+  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\",\"user_name\":\"test-lib\","
-      "\"kind\":\"script\"},\"hits\":[5,1,6,1]}]}", lib.index());
+              "{\"type\":\"CodeCoverage\",\"id\":\"coverage\",\"coverage\":["
+              "{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
+              "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
+              "\"name\":\"test-lib\",\"user_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 h_lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(h_lib);
-  Library& lib = Library::Handle();
-  lib ^= Api::UnwrapHandle(h_lib);
-  EXPECT(!lib.IsNull());
-  Dart_Handle result = Dart_Invoke(h_lib, NewString("main"), 0, NULL);
+  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(h_lib, NewString("port"), port));
+  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   // Look up the service id of Foo.
   const Class& cls = Class::Handle(
-      lib.LookupClass(String::Handle(String::New("Foo"))));
+      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(h_lib, buf);
+  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\",\"user_name\":\"test-lib\","
-      "\"kind\":\"script\"},\"hits\":[5,1,7,4,8,3]}]}", lib.index());
+              "{\"type\":\"CodeCoverage\",\"id\":\"coverage\",\"coverage\":["
+              "{\"source\":\"test-lib\",\"script\":{\"type\":\"@Script\","
+              "\"id\":\"libraries\\/%" Pd "\\/scripts\\/test-lib\","
+              "\"name\":\"test-lib\",\"user_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 h_lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(h_lib);
-  Library& lib = Library::Handle();
-  lib ^= Api::UnwrapHandle(h_lib);
-  EXPECT(!lib.IsNull());
-  Dart_Handle result = Dart_Invoke(h_lib, NewString("main"), 0, NULL);
+  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(h_lib, NewString("port"), port));
+  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   // Look up the service id of Foo.
   const Class& cls = Class::Handle(
-      lib.LookupClass(String::Handle(String::New("Foo"))));
+      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());
   intptr_t function_id = -1;
   function_id = cls.FindFunctionIndex(func);
   ASSERT(function_id != -1);
 
   char buf[1024];
   OS::SNPrint(buf, sizeof(buf),
               "[0, port, ['classes', '%" Pd "', 'functions',"
               "'% " Pd "', 'coverage'], [], []]", i,  function_id);
 
   Array& service_msg = Array::Handle();
-  service_msg = Eval(h_lib, buf);
+  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\",\"user_name\":\"test-lib\","
-      "\"kind\":\"script\"},\"hits\":[7,4,8,3]}]}", lib.index());
+      "\"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 h_lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(h_lib);
-  Library& lib = Library::Handle();
-  lib ^= Api::UnwrapHandle(h_lib);
-  EXPECT(!lib.IsNull());
-  Dart_Handle result = Dart_Invoke(h_lib, NewString("main"), 0, NULL);
+  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(h_lib, NewString("port"), port));
+  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Array& service_msg = Array::Handle();
-  service_msg = Eval(h_lib, "[0, port, ['allocationprofile'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['allocationprofile'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"AllocationProfile\"", handler.msg());
 
   // Too long.
-  service_msg = Eval(h_lib, "[0, port, ['allocationprofile', 'foo'], [], []]");
+  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(h_lib,
+  service_msg = Eval(lib,
                      "[0, port, ['allocationprofile'], ['gc'], ['cat']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // Bad reset option.
-  service_msg = Eval(h_lib,
+  service_msg = Eval(lib,
                      "[0, port, ['allocationprofile'], ['reset'], ['ff']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 
   // Good reset.
   service_msg =
-      Eval(h_lib, "[0, port, ['allocationprofile'], ['reset'], ['true']]");
+      Eval(lib, "[0, port, ['allocationprofile'], ['reset'], ['true']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"AllocationProfile\"", handler.msg());
 
   // Good GC.
   service_msg =
-      Eval(h_lib, "[0, port, ['allocationprofile'], ['gc'], ['full']]");
+      Eval(lib, "[0, port, ['allocationprofile'], ['gc'], ['full']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"type\":\"AllocationProfile\"", handler.msg());
 
   // Good GC and reset.
-  service_msg = Eval(h_lib,
+  service_msg = Eval(lib,
       "[0, port, ['allocationprofile'], ['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++.
@@ skipping 173 matching lines @@
   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 h_lib = TestCase::LoadTestScript(kScript, NULL);
-  EXPECT_VALID(h_lib);
-  Library& lib = Library::Handle();
-  lib ^= Api::UnwrapHandle(h_lib);
-  EXPECT(!lib.IsNull());
-  Dart_Handle result = Dart_Invoke(h_lib, NewString("main"), 0, NULL);
+  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(h_lib, NewString("port"), port));
+  EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Array& service_msg = Array::Handle();
-  service_msg = Eval(h_lib, "[0, port, ['profile'], [], []]");
+  service_msg = Eval(lib, "[0, port, ['profile'], [], []]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Expect profile
   EXPECT_SUBSTRING("\"type\":\"Profile\"", handler.msg());
 
-  service_msg = Eval(h_lib, "[0, port, ['profile'], ['tags'], ['hide']]");
+  service_msg = Eval(lib, "[0, port, ['profile'], ['tags'], ['hide']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Expect profile
   EXPECT_SUBSTRING("\"type\":\"Profile\"", handler.msg());
 
-  service_msg = Eval(h_lib, "[0, port, ['profile'], ['tags'], ['hidden']]");
+  service_msg = Eval(lib, "[0, port, ['profile'], ['tags'], ['hidden']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Expect error.
   EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 }
 
 #endif  // !defined(TARGET_ARCH_ARM64)
 
 }  // namespace dart