vmservice protocol cleanup

runtime/vm/report_test.cc

Index: runtime/vm/report_test.cc
diff --git a/runtime/vm/report_test.cc b/runtime/vm/report_test.cc
index 88b6839ce866f93dd384bc13fd33fc2df04f08bd..e10bd5b32c071d2ac8864636c3b6fb0abcc7c050 100644
--- a/runtime/vm/report_test.cc
+++ b/runtime/vm/report_test.cc
@@ -31,8 +31,8 @@ TEST_CASE(TraceJSWarning) {
       EXPECT_SUBSTRING("\"message\":{\"type\":\"JSCompatibilityWarning\","
                        "\"script\":{\"type\":\"@Script\",\"id\":"
                        "\"libraries\\/-1\\/scripts\\/Plug\","
-                       "\"name\":\"Plug\",\"user_name\":"
-                       "\"Plug\",\"kind\":\"script\"},\"tokenPos\":0,"
+                       "\"name\":\"Plug\","
+                       "\"kind\":\"script\"},\"tokenPos\":0,"
                        "\"message\":{\"type\":\"@String\"",
                        js.ToCString());
       // Skip private _OneByteString.
@@ -49,7 +49,7 @@ TEST_CASE(TraceJSWarning) {
   EXPECT_SUBSTRING("{\"type\":\"JSCompatibilityWarning\",\"script\":{\"type\":"
                    "\"@Script\",\"id\":\"libraries\\/-1\\/scripts\\/Plug\","
                    "\"name\":\"Plug\","
-                   "\"user_name\":\"Plug\",\"kind\":\"script\"},\"tokenPos\":0,"
+                   "\"kind\":\"script\"},\"tokenPos\":0,"
                    "\"message\":{\"type\":\"@String\"",
                    trace_buffer->At(0)->message);
   // Skip private _OneByteString.
@@ -59,7 +59,7 @@ TEST_CASE(TraceJSWarning) {
   EXPECT_SUBSTRING("{\"type\":\"JSCompatibilityWarning\",\"script\":{\"type\":"
                    "\"@Script\",\"id\":\"libraries\\/-1\\/scripts\\/Plug\","
                    "\"name\":\"Plug\","
-                   "\"user_name\":\"Plug\",\"kind\":\"script\"},\"tokenPos\":1,"
+                   "\"kind\":\"script\"},\"tokenPos\":1,"
                    "\"message\":{\"type\":\"@String\"",
                    trace_buffer->At(1)->message);
   // Skip private _OneByteString.
@@ -70,4 +70,3 @@ TEST_CASE(TraceJSWarning) {
 }
 
 }  // namespace dart
-