Simplify various name flavors in VM.

runtime/observatory/tests/service/get_object_rpc_test.dart

 // Copyright (c) 2015, 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.
 // VMOptions=--error_on_bad_type --error_on_bad_override
 
 library get_object_rpc_test;
 
 import 'dart:typed_data';
 import 'dart:convert' show BASE64;
 import 'package:observatory/service_io.dart';
@@ skipping 63 matching lines @@
     var params = {
       'objectId': 'objects/int-123',
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('Int'));
     expect(result['_vmType'], equals('Smi'));
     expect(result['id'], equals('objects/int-123'));
     expect(result['valueAsString'], equals('123'));
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_Smi'));
+    expect(result['class']['name'], equals('int'));

[Cutch, 2016/02/23 17:42:53]

I think we still want to use the ScrubbedName (the variant that keeps the
internal class names) here and elsewhere in the service protocol.

     expect(result['size'], isZero);
     expect(result['fields'], isEmpty);
   },
 
   // A string
   (Isolate isolate) async {
     // Call eval to get a Dart list.
     var evalResult = await eval(isolate, '"Chattanooga"');
     var params = {
       'objectId': evalResult['id'],
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('String'));
     expect(result['_vmType'], equals('String'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], equals('Chattanooga'));
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_OneByteString'));
+    expect(result['class']['name'], equals('String'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(11));
     expect(result['offset'], isNull);
     expect(result['count'], isNull);
   },
 
   // String prefix.
   (Isolate isolate) async {
     // Call eval to get a Dart list.
     var evalResult = await eval(isolate, '"Chattanooga"');
     var params = {
       'objectId': evalResult['id'],
       'count': 4,
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('String'));
     expect(result['_vmType'], equals('String'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], equals('Chat'));
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_OneByteString'));
+    expect(result['class']['name'], equals('String'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(11));
     expect(result['offset'], isNull);
     expect(result['count'], equals(4));
   },
 
   // String subrange.
   (Isolate isolate) async {
     // Call eval to get a Dart list.
     var evalResult = await eval(isolate, '"Chattanooga"');
     var params = {
       'objectId': evalResult['id'],
       'offset': 4,
       'count': 6,
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('String'));
     expect(result['_vmType'], equals('String'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], equals('tanoog'));
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_OneByteString'));
+    expect(result['class']['name'], equals('String'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(11));
     expect(result['offset'], equals(4));
     expect(result['count'], equals(6));
   },
 
   // String with wacky offset.
   (Isolate isolate) async {
     // Call eval to get a Dart list.
     var evalResult = await eval(isolate, '"Chattanooga"');
     var params = {
       'objectId': evalResult['id'],
       'offset': 100,
       'count': 2,
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('String'));
     expect(result['_vmType'], equals('String'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], equals(''));
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_OneByteString'));
+    expect(result['class']['name'], equals('String'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(11));
     expect(result['offset'], equals(11));
     expect(result['count'], equals(0));
   },
 
   // A built-in List.
   (Isolate isolate) async {
     // Call eval to get a Dart list.
     var evalResult = await eval(isolate, '[3, 2, 1]');
     var params = {
       'objectId': evalResult['id'],
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('List'));
     expect(result['_vmType'], equals('GrowableObjectArray'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], isNull);
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_GrowableList'));
+    expect(result['class']['name'], equals('List'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(3));
     expect(result['offset'], isNull);
     expect(result['count'], isNull);
     expect(result['elements'].length, equals(3));
     expect(result['elements'][0]['type'], equals('@Instance'));
     expect(result['elements'][0]['kind'], equals('Int'));
     expect(result['elements'][0]['valueAsString'], equals('3'));
     expect(result['elements'][1]['type'], equals('@Instance'));
@@ skipping 12 matching lines @@
       'objectId': evalResult['id'],
       'count': 2,
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('List'));
     expect(result['_vmType'], equals('GrowableObjectArray'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], isNull);
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_GrowableList'));
+    expect(result['class']['name'], equals('List'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(3));
     expect(result['offset'], isNull);
     expect(result['count'], equals(2));
     expect(result['elements'].length, equals(2));
     expect(result['elements'][0]['type'], equals('@Instance'));
     expect(result['elements'][0]['kind'], equals('Int'));
     expect(result['elements'][0]['valueAsString'], equals('3'));
     expect(result['elements'][1]['type'], equals('@Instance'));
@@ skipping 10 matching lines @@
       'offset': 2,
       'count': 2,
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('List'));
     expect(result['_vmType'], equals('GrowableObjectArray'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], isNull);
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_GrowableList'));
+    expect(result['class']['name'], equals('List'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(3));
     expect(result['offset'], equals(2));
     expect(result['count'], equals(1));
     expect(result['elements'].length, equals(1));
     expect(result['elements'][0]['type'], equals('@Instance'));
     expect(result['elements'][0]['kind'], equals('Int'));
     expect(result['elements'][0]['valueAsString'], equals('1'));
   },
 
   // List with wacky offset.
   (Isolate isolate) async {
     // Call eval to get a Dart list.
     var evalResult = await eval(isolate, '[3, 2, 1]');
     var params = {
       'objectId': evalResult['id'],
       'offset': 100,
       'count': 2,
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('List'));
     expect(result['_vmType'], equals('GrowableObjectArray'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], isNull);
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_GrowableList'));
+    expect(result['class']['name'], equals('List'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(3));
     expect(result['offset'], equals(3));
     expect(result['count'], equals(0));
     expect(result['elements'], isEmpty);
   },
 
   // A built-in Map.
   (Isolate isolate) async {
@@ skipping 135 matching lines @@
     var params = {
       'objectId': evalResult['id'],
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('Uint8List'));
     expect(result['_vmType'], equals('TypedData'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], isNull);
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_Uint8Array'));
+    expect(result['class']['name'], equals('Uint8List'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(3));
     expect(result['offset'], isNull);
     expect(result['count'], isNull);
     expect(result['bytes'], equals('AwIB'));
     Uint8List bytes = BASE64.decode(result['bytes']);
     expect(bytes.buffer.asUint8List().toString(), equals('[3, 2, 1]'));
   },
 
   // Uint8List prefix.
   (Isolate isolate) async {
     // Call eval to get a Dart list.
     var evalResult = await eval(isolate, 'uint8List');
     var params = {
       'objectId': evalResult['id'],
       'count' : 2,
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('Uint8List'));
     expect(result['_vmType'], equals('TypedData'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], isNull);
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_Uint8Array'));
+    expect(result['class']['name'], equals('Uint8List'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(3));
     expect(result['offset'], isNull);
     expect(result['count'], equals(2));
     expect(result['bytes'], equals('AwI='));
     Uint8List bytes = BASE64.decode(result['bytes']);
     expect(bytes.buffer.asUint8List().toString(), equals('[3, 2]'));
   },
 
   // Uint8List suffix.
   (Isolate isolate) async {
     // Call eval to get a Dart list.
     var evalResult = await eval(isolate, 'uint8List');
     var params = {
       'objectId': evalResult['id'],
       'offset' : 2,
       'count' : 2,
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('Uint8List'));
     expect(result['_vmType'], equals('TypedData'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], isNull);
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_Uint8Array'));
+    expect(result['class']['name'], equals('Uint8List'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(3));
     expect(result['offset'], equals(2));
     expect(result['count'], equals(1));
     expect(result['bytes'], equals('AQ=='));
     Uint8List bytes = BASE64.decode(result['bytes']);
     expect(bytes.buffer.asUint8List().toString(), equals('[1]'));
   },
 
   // Uint8List with wacky offset.
   (Isolate isolate) async {
     // Call eval to get a Dart list.
     var evalResult = await eval(isolate, 'uint8List');
     var params = {
       'objectId': evalResult['id'],
       'offset' : 100,
       'count' : 2,
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('Uint8List'));
     expect(result['_vmType'], equals('TypedData'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], isNull);
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_Uint8Array'));
+    expect(result['class']['name'], equals('Uint8List'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(3));
     expect(result['offset'], equals(3));
     expect(result['count'], equals(0));
     expect(result['bytes'], equals(''));
   },
 
   // Uint64List.
   (Isolate isolate) async {
     // Call eval to get a Dart list.
     var evalResult = await eval(isolate, 'uint64List');
     var params = {
       'objectId': evalResult['id'],
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('Uint64List'));
     expect(result['_vmType'], equals('TypedData'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], isNull);
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_Uint64Array'));
+    expect(result['class']['name'], equals('Uint64List'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(3));
     expect(result['offset'], isNull);
     expect(result['count'], isNull);
     expect(result['bytes'], equals('AwAAAAAAAAACAAAAAAAAAAEAAAAAAAAA'));
     Uint8List bytes = BASE64.decode(result['bytes']);
     expect(bytes.buffer.asUint64List().toString(), equals('[3, 2, 1]'));
   },
 
   // Uint64List prefix.
   (Isolate isolate) async {
     // Call eval to get a Dart list.
     var evalResult = await eval(isolate, 'uint64List');
     var params = {
       'objectId': evalResult['id'],
       'count' : 2,
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('Uint64List'));
     expect(result['_vmType'], equals('TypedData'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], isNull);
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_Uint64Array'));
+    expect(result['class']['name'], equals('Uint64List'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(3));
     expect(result['offset'], isNull);
     expect(result['count'], equals(2));
     expect(result['bytes'], equals('AwAAAAAAAAACAAAAAAAAAA=='));
     Uint8List bytes = BASE64.decode(result['bytes']);
     expect(bytes.buffer.asUint64List().toString(), equals('[3, 2]'));
   },
 
   // Uint64List suffix.
   (Isolate isolate) async {
     // Call eval to get a Dart list.
     var evalResult = await eval(isolate, 'uint64List');
     var params = {
       'objectId': evalResult['id'],
       'offset' : 2,
       'count' : 2,
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('Uint64List'));
     expect(result['_vmType'], equals('TypedData'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], isNull);
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_Uint64Array'));
+    expect(result['class']['name'], equals('Uint64List'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(3));
     expect(result['offset'], equals(2));
     expect(result['count'], equals(1));
     expect(result['bytes'], equals('AQAAAAAAAAA='));
     Uint8List bytes = BASE64.decode(result['bytes']);
     expect(bytes.buffer.asUint64List().toString(), equals('[1]'));
   },
 
   // Uint64List with wacky offset.
   (Isolate isolate) async {
     // Call eval to get a Dart list.
     var evalResult = await eval(isolate, 'uint64List');
     var params = {
       'objectId': evalResult['id'],
       'offset' : 100,
       'count' : 2,
     };
     var result = await isolate.invokeRpcNoUpgrade('getObject', params);
     expect(result['type'], equals('Instance'));
     expect(result['kind'], equals('Uint64List'));
     expect(result['_vmType'], equals('TypedData'));
     expect(result['id'], startsWith('objects/'));
     expect(result['valueAsString'], isNull);
     expect(result['class']['type'], equals('@Class'));
-    expect(result['class']['name'], equals('_Uint64Array'));
+    expect(result['class']['name'], equals('Uint64List'));
     expect(result['size'], isPositive);
     expect(result['fields'], isEmpty);
     expect(result['length'], equals(3));
     expect(result['offset'], equals(3));
     expect(result['count'], equals(0));
     expect(result['bytes'], equals(''));
   },
 
   // An expired object.
   (Isolate isolate) async {
@@ skipping 309 matching lines @@
       caughtException = true;
       expect(e.code, equals(ServerRpcException.kInvalidParams));
       expect(e.message,
              "getObject: invalid 'objectId' parameter: code/0");
     }
     expect(caughtException, isTrue);
   },
 ];
 
 main(args) async => runIsolateTests(args, tests, testeeBefore:warmup);