vmservice protocol cleanup

tests/standalone/vmservice/test_helper.dart

 // 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.
 
 library vmservice_test_helper;
 
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'package:expect/expect.dart';
@@ skipping 190 matching lines @@
   }
 }
 
 class ClassTableHelper {
   final Map classTable;
 
   ClassTableHelper(this.classTable) {
     Expect.equals('ClassList', classTable['type'], 'Not a ClassTable.');
   }
 
-  bool classExists(String user_name) {
+  bool classExists(String name) {
     List members = classTable['members'];
     for (var i = 0; i < members.length; i++) {
       Map klass = members[i];
-      if (klass['user_name'] == user_name) {
+      if (klass['name'] == name) {
         return true;
       }
     }
     return false;
   }
 
-  String classId(String user_name) {
+  String classId(String name) {
     List members = classTable['members'];
     for (var i = 0; i < members.length; i++) {
       Map klass = members[i];
-      if (klass['user_name'] == user_name) {
+      if (klass['name'] == name) {
         return klass['id'];
       }
     }
     return null;
   }
 }
 
 class FieldRequestHelper extends VmServiceRequestHelper {
   FieldRequestHelper(port, isolate_id, field_id) :
       super('http://127.0.0.1:$port/$isolate_id/$field_id');
@@ skipping 15 matching lines @@
     isolate_id_ = isolate_id;
   }
   final Map<String, Map> fields = new Map<String, Map>();
 
   onRequestCompleted(Map reply) {
     Expect.equals('Class', reply['type']);
     List<Map> class_fields = reply['fields'];
     List<Future> requests = new List<Future>();
     fieldNames.forEach((fn) {
       class_fields.forEach((f) {
-        if (f['user_name'] == fn) {
+        if (f['name'] == fn) {
           var request = new FieldRequestHelper(port_, isolate_id_, f['id']);
           requests.add(request.makeRequest());
         }
       });
     });
     return Future.wait(requests).then((a) {
       a.forEach((FieldRequestHelper field) {
-        fields[field.field['user_name']] = field.field;
+        fields[field.field['name']] = field.field;
       });
       return this;
     });
   }
 }