Add a VM page to the 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 "include/dart_debugger_api.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/globals.h"
 #include "vm/message_handler.h"
@@ skipping 945 matching lines @@
 
   // Request malformed native code.
   service_msg = EvalF(h_lib, "[port, ['code', 'native%" Px "'], [], []]",
                       address);
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   EXPECT_SUBSTRING("\"message\":\"Malformed code id:", handler.msg());
 }
 
 
-TEST_CASE(Service_Cpu) {
+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, DartLibraryCalls::NewSendPort(port_id));
   EXPECT_VALID(port);
   EXPECT_VALID(Dart_SetField(lib, NewString("port"), port));
 
   Instance& service_msg = Instance::Handle();
-  service_msg = Eval(lib, "[port, ['cpu'], [], []]");
+  service_msg = Eval(lib, "[port, ['vm'], [], []]");
 
   Service::HandleRootMessage(service_msg);
   handler.HandleNextMessage();
-  EXPECT_SUBSTRING("\"type\":\"CPU\"", handler.msg());
+  EXPECT_SUBSTRING("\"type\":\"VM\",\"id\":\"vm\"", handler.msg());
+  EXPECT_SUBSTRING("\"architecture\"", handler.msg());
+  EXPECT_SUBSTRING("\"version\"", handler.msg());
+  EXPECT_SUBSTRING("\"uptime\"", handler.msg());
+  EXPECT_SUBSTRING("\"isolates\"", handler.msg());
 }
 
 
 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"
@@ skipping 235 matching lines @@
   EXPECT_SUBSTRING("\"type\":\"Profile\"", handler.msg());
 
   service_msg = Eval(h_lib, "[port, ['profile'], ['tags'], ['hidden']]");
   Service::HandleIsolateMessage(isolate, service_msg);
   handler.HandleNextMessage();
   // Expect error.
   EXPECT_SUBSTRING("\"type\":\"Error\"", handler.msg());
 }
 
 }  // namespace dart