Rework how types work in the VM Service.

runtime/vm/json_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/assert.h"
 #include "platform/json.h"
 #include "vm/json_stream.h"
 #include "vm/unit_test.h"
 
 namespace dart {
@@ skipping 280 matching lines @@
 
 
 TEST_CASE(JSON_JSONStream_DartObject) {
   JSONStream js;
   {
     JSONArray jsarr(&js);
     jsarr.AddValue(Object::Handle(Object::null()));
     JSONObject jsobj(&jsarr);
     jsobj.AddProperty("object_key", Object::Handle(Object::null()));
   }
-  EXPECT_STREQ("[{\"type\":\"@Null\",\"id\":\"objects\\/null\","
+  EXPECT_STREQ("[{\"type\":\"@null\",\"id\":\"objects\\/null\","
                "\"valueAsString\":\"null\"},"
-               "{\"object_key\":{\"type\":\"@Null\",\"id\":\"objects\\/null\","
+               "{\"object_key\":{\"type\":\"@null\",\"id\":\"objects\\/null\","
                "\"valueAsString\":\"null\"}}]",
                js.ToCString());
 }
 
 TEST_CASE(JSON_JSONStream_EscapedString) {
   JSONStream js;
   {
     JSONArray jsarr(&js);
     jsarr.AddValue("Hel\"\"lo\r\n\t");
   }
@@ skipping 16 matching lines @@
   js.SetOptions(&option_keys[0], &option_values[0], 3);
   EXPECT(js.num_options() == 3);
   EXPECT(!js.HasOption("lizard"));
   EXPECT(js.HasOption("dog"));
   EXPECT(js.HasOption("cat"));
   EXPECT(js.OptionIs("cat", "banana"));
   EXPECT(!js.OptionIs("dog", "banana"));
 }
 
 }  // namespace dart