| Index: runtime/observatory/tests/service/get_object_rpc_test.dart
 | 
| diff --git a/runtime/observatory/tests/service/get_object_rpc_test.dart b/runtime/observatory/tests/service/get_object_rpc_test.dart
 | 
| index a838d838db4ed06982414677ee2625c72aaf872d..e933d4916e62299b2063c61f75cb5fb6cf70b21d 100644
 | 
| --- a/runtime/observatory/tests/service/get_object_rpc_test.dart
 | 
| +++ b/runtime/observatory/tests/service/get_object_rpc_test.dart
 | 
| @@ -13,10 +13,12 @@ import 'test_helper.dart';
 | 
|  
 | 
|  class _DummyClass {
 | 
|    static var dummyVar = 11;
 | 
| -  void dummyFunction() {}
 | 
| +  void dummyFunction() {
 | 
| +  }
 | 
|  }
 | 
|  
 | 
| -class _DummySubClass extends _DummyClass {}
 | 
| +class _DummySubClass extends _DummyClass {
 | 
| +}
 | 
|  
 | 
|  void warmup() {
 | 
|    // Silence analyzer.
 | 
| @@ -456,7 +458,7 @@ var tests = [
 | 
|      var evalResult = await eval(isolate, 'uint8List');
 | 
|      var params = {
 | 
|        'objectId': evalResult['id'],
 | 
| -      'count': 2,
 | 
| +      'count' : 2,
 | 
|      };
 | 
|      var result = await isolate.invokeRpcNoUpgrade('getObject', params);
 | 
|      expect(result['type'], equals('Instance'));
 | 
| @@ -482,8 +484,8 @@ var tests = [
 | 
|      var evalResult = await eval(isolate, 'uint8List');
 | 
|      var params = {
 | 
|        'objectId': evalResult['id'],
 | 
| -      'offset': 2,
 | 
| -      'count': 2,
 | 
| +      'offset' : 2,
 | 
| +      'count' : 2,
 | 
|      };
 | 
|      var result = await isolate.invokeRpcNoUpgrade('getObject', params);
 | 
|      expect(result['type'], equals('Instance'));
 | 
| @@ -509,8 +511,8 @@ var tests = [
 | 
|      var evalResult = await eval(isolate, 'uint8List');
 | 
|      var params = {
 | 
|        'objectId': evalResult['id'],
 | 
| -      'offset': 100,
 | 
| -      'count': 2,
 | 
| +      'offset' : 100,
 | 
| +      'count' : 2,
 | 
|      };
 | 
|      var result = await isolate.invokeRpcNoUpgrade('getObject', params);
 | 
|      expect(result['type'], equals('Instance'));
 | 
| @@ -559,7 +561,7 @@ var tests = [
 | 
|      var evalResult = await eval(isolate, 'uint64List');
 | 
|      var params = {
 | 
|        'objectId': evalResult['id'],
 | 
| -      'count': 2,
 | 
| +      'count' : 2,
 | 
|      };
 | 
|      var result = await isolate.invokeRpcNoUpgrade('getObject', params);
 | 
|      expect(result['type'], equals('Instance'));
 | 
| @@ -585,8 +587,8 @@ var tests = [
 | 
|      var evalResult = await eval(isolate, 'uint64List');
 | 
|      var params = {
 | 
|        'objectId': evalResult['id'],
 | 
| -      'offset': 2,
 | 
| -      'count': 2,
 | 
| +      'offset' : 2,
 | 
| +      'count' : 2,
 | 
|      };
 | 
|      var result = await isolate.invokeRpcNoUpgrade('getObject', params);
 | 
|      expect(result['type'], equals('Instance'));
 | 
| @@ -612,8 +614,8 @@ var tests = [
 | 
|      var evalResult = await eval(isolate, 'uint64List');
 | 
|      var params = {
 | 
|        'objectId': evalResult['id'],
 | 
| -      'offset': 100,
 | 
| -      'count': 2,
 | 
| +      'offset' : 100,
 | 
| +      'count' : 2,
 | 
|      };
 | 
|      var result = await isolate.invokeRpcNoUpgrade('getObject', params);
 | 
|      expect(result['type'], equals('Instance'));
 | 
| @@ -676,12 +678,12 @@ var tests = [
 | 
|      bool caughtException;
 | 
|      try {
 | 
|        await isolate.invokeRpcNoUpgrade('getObject', params);
 | 
| -      expect(false, isTrue, reason: 'Unreachable');
 | 
| -    } on ServerRpcException catch (e) {
 | 
| +      expect(false, isTrue, reason:'Unreachable');
 | 
| +    } on ServerRpcException catch(e) {
 | 
|        caughtException = true;
 | 
|        expect(e.code, equals(ServerRpcException.kInvalidParams));
 | 
|        expect(e.message,
 | 
| -          "getObject: invalid 'objectId' parameter: libraries/9999999");
 | 
| +             "getObject: invalid 'objectId' parameter: libraries/9999999");
 | 
|      }
 | 
|      expect(caughtException, isTrue);
 | 
|    },
 | 
| @@ -719,12 +721,12 @@ var tests = [
 | 
|      bool caughtException;
 | 
|      try {
 | 
|        await isolate.invokeRpcNoUpgrade('getObject', params);
 | 
| -      expect(false, isTrue, reason: 'Unreachable');
 | 
| -    } on ServerRpcException catch (e) {
 | 
| +      expect(false, isTrue, reason:'Unreachable');
 | 
| +    } on ServerRpcException catch(e) {
 | 
|        caughtException = true;
 | 
|        expect(e.code, equals(ServerRpcException.kInvalidParams));
 | 
|        expect(e.message,
 | 
| -          "getObject: invalid 'objectId' parameter: scripts/9999999");
 | 
| +             "getObject: invalid 'objectId' parameter: scripts/9999999");
 | 
|      }
 | 
|      expect(caughtException, isTrue);
 | 
|    },
 | 
| @@ -766,12 +768,12 @@ var tests = [
 | 
|      bool caughtException;
 | 
|      try {
 | 
|        await isolate.invokeRpcNoUpgrade('getObject', params);
 | 
| -      expect(false, isTrue, reason: 'Unreachable');
 | 
| -    } on ServerRpcException catch (e) {
 | 
| +      expect(false, isTrue, reason:'Unreachable');
 | 
| +    } on ServerRpcException catch(e) {
 | 
|        caughtException = true;
 | 
|        expect(e.code, equals(ServerRpcException.kInvalidParams));
 | 
|        expect(e.message,
 | 
| -          "getObject: invalid 'objectId' parameter: classes/9999999");
 | 
| +             "getObject: invalid 'objectId' parameter: classes/9999999");
 | 
|      }
 | 
|      expect(caughtException, isTrue);
 | 
|    },
 | 
| @@ -806,12 +808,12 @@ var tests = [
 | 
|      bool caughtException;
 | 
|      try {
 | 
|        await isolate.invokeRpcNoUpgrade('getObject', params);
 | 
| -      expect(false, isTrue, reason: 'Unreachable');
 | 
| -    } on ServerRpcException catch (e) {
 | 
| +      expect(false, isTrue, reason:'Unreachable');
 | 
| +    } on ServerRpcException catch(e) {
 | 
|        caughtException = true;
 | 
|        expect(e.code, equals(ServerRpcException.kInvalidParams));
 | 
| -      expect(
 | 
| -          e.message, startsWith("getObject: invalid 'objectId' parameter: "));
 | 
| +      expect(e.message,
 | 
| +             startsWith("getObject: invalid 'objectId' parameter: "));
 | 
|      }
 | 
|      expect(caughtException, isTrue);
 | 
|    },
 | 
| @@ -851,12 +853,12 @@ var tests = [
 | 
|      bool caughtException;
 | 
|      try {
 | 
|        await isolate.invokeRpcNoUpgrade('getObject', params);
 | 
| -      expect(false, isTrue, reason: 'Unreachable');
 | 
| -    } on ServerRpcException catch (e) {
 | 
| +      expect(false, isTrue, reason:'Unreachable');
 | 
| +    } on ServerRpcException catch(e) {
 | 
|        caughtException = true;
 | 
|        expect(e.code, equals(ServerRpcException.kInvalidParams));
 | 
| -      expect(
 | 
| -          e.message, startsWith("getObject: invalid 'objectId' parameter: "));
 | 
| +      expect(e.message,
 | 
| +             startsWith("getObject: invalid 'objectId' parameter: "));
 | 
|      }
 | 
|      expect(caughtException, isTrue);
 | 
|    },
 | 
| @@ -894,12 +896,12 @@ var tests = [
 | 
|      bool caughtException;
 | 
|      try {
 | 
|        await isolate.invokeRpcNoUpgrade('getObject', params);
 | 
| -      expect(false, isTrue, reason: 'Unreachable');
 | 
| -    } on ServerRpcException catch (e) {
 | 
| +      expect(false, isTrue, reason:'Unreachable');
 | 
| +    } on ServerRpcException catch(e) {
 | 
|        caughtException = true;
 | 
|        expect(e.code, equals(ServerRpcException.kInvalidParams));
 | 
| -      expect(
 | 
| -          e.message, startsWith("getObject: invalid 'objectId' parameter: "));
 | 
| +      expect(e.message,
 | 
| +             startsWith("getObject: invalid 'objectId' parameter: "));
 | 
|      }
 | 
|      expect(caughtException, isTrue);
 | 
|    },
 | 
| @@ -928,10 +930,8 @@ var tests = [
 | 
|      expect(result['_objectPool'], isNotNull);
 | 
|      expect(result['_disassembly'], isNotNull);
 | 
|      expect(result['_descriptors'], isNotNull);
 | 
| -    expect(
 | 
| -        result['_inlinedFunctions'], anyOf([isNull, new isInstanceOf<List>()]));
 | 
| -    expect(
 | 
| -        result['_inlinedIntervals'], anyOf([isNull, new isInstanceOf<List>()]));
 | 
| +    expect(result['_inlinedFunctions'], anyOf([isNull, new isInstanceOf<List>()]));
 | 
| +    expect(result['_inlinedIntervals'], anyOf([isNull, new isInstanceOf<List>()]));
 | 
|    },
 | 
|  
 | 
|    // invalid code.
 | 
| @@ -942,14 +942,15 @@ var tests = [
 | 
|      bool caughtException;
 | 
|      try {
 | 
|        await isolate.invokeRpcNoUpgrade('getObject', params);
 | 
| -      expect(false, isTrue, reason: 'Unreachable');
 | 
| -    } on ServerRpcException catch (e) {
 | 
| +      expect(false, isTrue, reason:'Unreachable');
 | 
| +    } on ServerRpcException catch(e) {
 | 
|        caughtException = true;
 | 
|        expect(e.code, equals(ServerRpcException.kInvalidParams));
 | 
| -      expect(e.message, "getObject: invalid 'objectId' parameter: code/0");
 | 
| +      expect(e.message,
 | 
| +             "getObject: invalid 'objectId' parameter: code/0");
 | 
|      }
 | 
|      expect(caughtException, isTrue);
 | 
|    },
 | 
|  ];
 | 
|  
 | 
| -main(args) async => runIsolateTests(args, tests, testeeBefore: warmup);
 | 
| +main(args) async => runIsolateTests(args, tests, testeeBefore:warmup);
 | 
| 
 |