Restore missing properties

runtime/observatory/tests/service/dev_fs_spawn_test.dart

 // Copyright (c) 2016, 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
 
 import 'dart:async';
 import 'dart:convert';
+import 'package:observatory/models.dart' as M;
 import 'package:observatory/service_io.dart';
 import 'package:unittest/unittest.dart';
 import 'service_test_common.dart';
 import 'test_helper.dart';
 
 var tests = [
   (VM vm) async {
     // Create a new fs.
     var fsName = 'scratch';
     var result = await vm.invokeRpcNoUpgrade('_createDevFS', {
@@ skipping 117 matching lines @@
     expect(result['type'], equals('Success'));
     var spawnedIsolate = await completer.future;
 
     // Wait for the spawned isolate to hit a breakpoint.
     await spawnedIsolate.load();
     await hasStoppedAtBreakpoint(spawnedIsolate);
 
     // Make sure that we are running code from the spawned isolate.
     result = await spawnedIsolate.rootLibrary.evaluate('proofOfLife()');
     expect(result.type, equals('Instance'));
-    expect(result.kind, equals('String'));
+    expect(result.kind, equals(M.InstanceKind.string));
     expect(result.valueAsString, equals('I live!'));
 
     // Spawn the script with arguments.
     completer = new Completer();
     sub = await vm.listenEventStream(
       VM.kIsolateStream,
       (ServiceEvent event) {
         if (event.kind == ServiceEvent.kIsolateSpawn) {
           expect(event.spawnToken, equals('mySpawnToken1'));
           expect(event.isolate, isNotNull);
@@ skipping 10 matching lines @@
     expect(result['type'], equals('Success'));
     spawnedIsolate = await completer.future;
 
     // Wait for the spawned isolate to hit a breakpoint.
     await spawnedIsolate.load();
     await hasStoppedAtBreakpoint(spawnedIsolate);
 
     // Make sure that we are running code from the spawned isolate.
     result = await spawnedIsolate.rootLibrary.evaluate('proofOfLife()');
     expect(result.type, equals('Instance'));
-    expect(result.kind, equals('String'));
+    expect(result.kind, equals(M.InstanceKind.string));
     expect(result.valueAsString, equals('I live, [one, two, three]!'));
 
     // Spawn the script with arguments and message
     completer = new Completer();
     sub = await vm.listenEventStream(
       VM.kIsolateStream,
       (ServiceEvent event) {
         if (event.kind == ServiceEvent.kIsolateSpawn) {
           expect(event.spawnToken, equals('mySpawnToken2'));
           expect(event.isolate, isNotNull);
@@ skipping 11 matching lines @@
     expect(result['type'], equals('Success'));
     spawnedIsolate = await completer.future;
 
     // Wait for the spawned isolate to hit a breakpoint.
     await spawnedIsolate.load();
     await hasStoppedAtBreakpoint(spawnedIsolate);
 
     // Make sure that we are running code from the spawned isolate.
     result = await spawnedIsolate.rootLibrary.evaluate('proofOfLife()');
     expect(result.type, equals('Instance'));
-    expect(result.kind, equals('String'));
+    expect(result.kind, equals(M.InstanceKind.string));
     expect(result.valueAsString, equals('I live, [A, B, C], test!'));
 
     // Delete the fs.
     result = await vm.invokeRpcNoUpgrade('_deleteDevFS', {
         'fsName': fsName,
     });
     expect(result['type'], equals('Success'));
   },
 ];
 
 main(args) async => runVMTests(args, tests);