Switch to using SourceLocation universally in service protocol.

runtime/observatory/tests/service/coverage_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=--compile-all --error_on_bad_type --error_on_bad_override
 
 import 'package:observatory/service_io.dart';
 import 'package:unittest/unittest.dart';
 import 'test_helper.dart';
 import 'dart:async';
 
@@ skipping 65 matching lines @@
       return completer.future;
     });
 },
 
 // Get coverage for function, class, library, script, and isolate.
 (Isolate isolate) {
   return isolate.getStack().then((ServiceMap stack) {
       // Make sure we are in the right place.
       expect(stack.type, equals('Stack'));
       expect(stack['frames'].length, greaterThanOrEqualTo(2));
-      expect(stack['frames'][0]['function'].name, equals('myFunction'));
-      expect(stack['frames'][0]['function'].dartOwner.name, equals('MyClass'));
+      expect(stack['frames'][0].function.name, equals('myFunction'));
+      expect(stack['frames'][0].function.dartOwner.name, equals('MyClass'));
 
       var lib = isolate.rootLibrary;
-      var func = stack['frames'][0]['function'];
+      var func = stack['frames'][0].function;
       expect(func.name, equals('myFunction'));
-      var cls = stack['frames'][0]['function'].dartOwner;
+      var cls = func.dartOwner;
       expect(cls.name, equals('MyClass'));
 
       List tests = [];
       // Function
       tests.add(isolate.invokeRpcNoUpgrade('_getCoverage',
                                            { 'targetId': func.id })
                 .then((Map coverage) {
                     expect(coverage['type'], equals('CodeCoverage'));
                     expect(coverage['coverage'].length, equals(1));
                     expect(normalize(coverage['coverage'][0]['hits']),
@@ skipping 16 matching lines @@
                     expect(coverage['type'], equals('CodeCoverage'));
                     expect(coverage['coverage'].length, equals(3));
                     expect(normalize(coverage['coverage'][0]['hits']),
                            equals([15, 1, 16, 1, 17, 0, 19, 1,
                                    24, 1, 25, 1, 27, 0]));
                     expect(normalize(coverage['coverage'][1]['hits']).take(12),
                            equals([33, 1, 36, 1, 37, 0, 32, 1, 45, 0, 46, 0]));
                 }));
       // Script
       tests.add(cls.load().then((_) {
-            return isolate.invokeRpcNoUpgrade('_getCoverage',
-                                              { 'targetId': cls.script.id })
+            return isolate.invokeRpcNoUpgrade(
+                '_getCoverage',
+                { 'targetId': cls.location.script.id })
                 .then((Map coverage) {
                     expect(coverage['type'], equals('CodeCoverage'));
                     expect(coverage['coverage'].length, equals(3));
                     expect(normalize(coverage['coverage'][0]['hits']),
                            equals([15, 1, 16, 1, 17, 0, 19, 1,
                                    24, 1, 25, 1, 27, 0]));
                     expect(normalize(coverage['coverage'][1]['hits']).take(12),
                            equals([33, 1, 36, 1, 37, 0, 32, 1, 45, 0, 46, 0]));
                 });
           }));
       // Isolate
       tests.add(cls.load().then((_) {
             return isolate.invokeRpcNoUpgrade('_getCoverage', {})
                 .then((Map coverage) {
                     expect(coverage['type'], equals('CodeCoverage'));
                     expect(coverage['coverage'].length, greaterThan(100));
                 });
           }));
       return Future.wait(tests);
   });
 },
 
 ];
 
 main(args) => runIsolateTests(args, tests, testeeConcurrent: testFunction);