vmservice protocol cleanup

tests/standalone/vmservice/isolate_class_field_test.dart

Index: tests/standalone/vmservice/isolate_class_field_test.dart
diff --git a/tests/standalone/vmservice/isolate_class_field_test.dart b/tests/standalone/vmservice/isolate_class_field_test.dart
index dd3f44e62a8eaeea2b49f4c0a15fdc117c144711..911ab795ae765ea36d907529f3de7e50d6603286 100644
--- a/tests/standalone/vmservice/isolate_class_field_test.dart
+++ b/tests/standalone/vmservice/isolate_class_field_test.dart
@@ -16,7 +16,6 @@ class BananaClassTest {
 
   _testFieldA(Map field) {
     Expect.equals('Field', field['type']);
-    Expect.equals('a', field['user_name']);
     Expect.equals('a', field['name']);
     Expect.equals(false, field['final']);
     Expect.equals(false, field['static']);
@@ -28,9 +27,8 @@ class BananaClassTest {
 
   _testFieldFinalFixedLengthList(Map field) {
     Expect.equals('Field', field['type']);
-    Expect.equals('final_fixed_length_list', field['user_name']);
     Expect.equals('final_fixed_length_list', field['name']);
-    Expect.equals('_Float32Array', field['guard_class']['user_name']);
+    Expect.equals('_Float32Array', field['guard_class']['name']);
     Expect.equals(true, field['final']);
     Expect.equals(false, field['static']);
     Expect.equals(false, field['const']);
@@ -39,23 +37,21 @@ class BananaClassTest {
 
   _testFieldFixedLengthList(Map field) {
     Expect.equals('Field', field['type']);
-    Expect.equals('fixed_length_list', field['user_name']);
     Expect.equals('fixed_length_list', field['name']);
     Expect.equals(false, field['final']);
     Expect.equals(false, field['static']);
     Expect.equals(false, field['const']);
-    Expect.equals('_Float32Array', field['guard_class']['user_name']);
+    Expect.equals('_Float32Array', field['guard_class']['name']);
     Expect.equals('variable', field['guard_length']);
   }
 
   _testFieldName(Map field) {
     Expect.equals('Field', field['type']);
-    Expect.equals('name', field['user_name']);
     Expect.equals('name', field['name']);
     Expect.equals(false, field['final']);
     Expect.equals(false, field['static']);
     Expect.equals(false, field['const']);
-    Expect.equals('_OneByteString', field['guard_class']['user_name']);
+    Expect.equals('_OneByteString', field['guard_class']['name']);
     Expect.equals(false, field['guard_nullable']);
     Expect.equals('variable', field['guard_length']);
   }
@@ -81,33 +77,30 @@ class BadBananaClassTest {
 
   _testFieldV(Map field) {
     Expect.equals('Field', field['type']);
-    Expect.equals('v', field['user_name']);
     Expect.equals('v', field['name']);
     Expect.equals(false, field['final']);
     Expect.equals(false, field['static']);
     Expect.equals(false, field['const']);
-    Expect.equals('_Double', field['guard_class']['user_name']);
+    Expect.equals('_Double', field['guard_class']['name']);
     Expect.equals(true, field['guard_nullable']);
     Expect.equals('variable', field['guard_length']);
   }
 
   _testFieldC(Map field) {
     Expect.equals('Field', field['type']);
-    Expect.equals('c', field['user_name']);
     Expect.equals('c', field['name']);
     Expect.equals(true, field['final']);
     Expect.equals(false, field['static']);
     Expect.equals(true, field['final']);
-    Expect.equals('_Smi', field['guard_class']['user_name']);
+    Expect.equals('_Smi', field['guard_class']['name']);
     Expect.equals(false, field['guard_nullable']);
     Expect.equals('variable', field['guard_length']);
   }
 
   _testFieldFinalFixedLengthList(Map field) {
     Expect.equals('Field', field['type']);
-    Expect.equals('final_fixed_length_list', field['user_name']);
     Expect.equals('final_fixed_length_list', field['name']);
-    Expect.equals('_Float32Array', field['guard_class']['user_name']);
+    Expect.equals('_Float32Array', field['guard_class']['name']);
     Expect.equals(true, field['final']);
     Expect.equals(false, field['static']);
     Expect.equals(false, field['const']);
@@ -116,9 +109,8 @@ class BadBananaClassTest {
 
   _testFieldFixedLengthArray(Map field) {
     Expect.equals('Field', field['type']);
-    Expect.equals('fixed_length_array', field['user_name']);
     Expect.equals('fixed_length_array', field['name']);
-    Expect.equals('_List', field['guard_class']['user_name']);
+    Expect.equals('_List', field['guard_class']['name']);
     Expect.equals(true, field['final']);
     Expect.equals(false, field['static']);
     Expect.equals(false, field['const']);