Sundry service protocol cleanups before version 1.0.

runtime/vm/object_test.cc

 // Copyright (c) 2012, 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 "vm/assembler.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
@@ skipping 4313 matching lines @@
     const String& func_name = String::Handle(String::New("toString"));
     Function& func = Function::Handle(cls.LookupFunction(func_name));
     ASSERT(!func.IsNull());
     func.PrintJSON(&js, true);
     elideSubstring("classes", js.ToCString(), buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Function\",\"fixedId\":true,"
         "\"id\":\"\",\"name\":\"toString\","
         "\"owner\":{\"type\":\"@Class\",\"fixedId\":true,\"id\":\"\","
         "\"name\":\"bool\"},"
-        "\"kind\":\"RegularFunction\"}",
+        "\"_kind\":\"RegularFunction\","
+        "\"static\":false,\"const\":false}",
         buffer);
   }
   // Library reference
   {
     JSONStream js;
     Library& lib = Library::Handle(isolate->object_store()->core_library());
     lib.PrintJSON(&js, true);
     elideSubstring("libraries", js.ToCString(), buffer);
     EXPECT_STREQ(
         "{\"type\":\"@Library\",\"fixedId\":true,\"id\":\"\","
@@ skipping 256 matching lines @@
   EXPECT_VALID(h_result);
   Integer& result = Integer::Handle();
   result ^= Api::UnwrapHandle(h_result);
   String& foo = String::Handle(String::New("foo"));
   Integer& expected = Integer::Handle();
   expected ^= foo.HashCode();
   EXPECT(result.IsIdenticalTo(expected));
 }
 
 }  // namespace dart