Fix some Observatory issues that crept in with my last couple changes.

runtime/observatory/test/debugging_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 --checked
 
 import 'package:observatory/service_io.dart';
 import 'package:unittest/unittest.dart';
 import 'test_helper.dart';
 import 'dart:async';
 
@@ skipping 55 matching lines @@
         }
       });
 
       // Add the breakpoint.
       var script = isolate.rootLib.scripts[0];
       return isolate.addBreakpoint(script, 18).then((result) {
           expect(result is Breakpoint, isTrue);
           Breakpoint bpt = result;
           expect(bpt.type, equals('Breakpoint'));
           expect(bpt.script.id, equals(script.id));
-          expect(bpt.tokenPos, equals(66));
+          expect(bpt.tokenPos, equals(58));
           expect(isolate.breakpoints.length, equals(1));
           return completer.future;  // Wait for breakpoint events.
       });
     });
 },
 
 // Get the stack trace
 (Isolate isolate) {
   return isolate.getStack().then((ServiceMap stack) {
       expect(stack.type, equals('Stack'));
       expect(stack['frames'].length, greaterThanOrEqualTo(1));
       expect(stack['frames'][0]['function'].name, equals('testFunction'));
+      expect(stack['frames'][0]['tokenPos'], equals(58));
   });
 },
 
 // Stepping
 (Isolate isolate) {
   // Set up a listener to wait for breakpoint events.
   Completer completer = new Completer();
   List events = [];
   var subscription;
   subscription = isolate.vm.events.stream.listen((ServiceEvent event) {
     if (event.eventType == ServiceEvent.kPauseBreakpoint) {
       print('Breakpoint reached');
       subscription.cancel();
       completer.complete();
     }
   });
 
   return isolate.stepInto().then((isolate) {
     return completer.future;  // Wait for breakpoint events.
   });
 },
 
-// Get the stack trace again.  We are in 'helper'.
+// Get the stack trace again.  Our position has updated.
 (Isolate isolate) {
   return isolate.getStack().then((ServiceMap stack) {
       expect(stack.type, equals('Stack'));
       expect(stack['frames'].length, greaterThanOrEqualTo(2));
-      expect(stack['frames'][0]['function'].name, equals('helper'));
+      expect(stack['frames'][0]['function'].name, equals('testFunction'));
+      expect(stack['frames'][0]['tokenPos'], equals(60));
   });
 },
 
 // Remove breakpoint
 (Isolate isolate) {
   // Set up a listener to wait for breakpoint events.
   Completer completer = new Completer();
   List events = [];
   var subscription;
   subscription = isolate.vm.events.stream.listen((ServiceEvent event) {
@@ skipping 44 matching lines @@
   ServiceFunction function = isolate.rootLib.functions.firstWhere(
       (f) => f.name == 'helper');
   expect(function, isNotNull);
 
   // Add the breakpoint at function entry
   return isolate.addBreakpointAtEntry(function).then((result) {
     expect(result is Breakpoint, isTrue);
     Breakpoint bpt = result;
     expect(bpt.type, equals('Breakpoint'));
     expect(bpt.script.name, equals('debugging_test.dart'));
-    expect(bpt.tokenPos, equals(28));
+    expect(bpt.tokenPos, equals(29));
     expect(isolate.breakpoints.length, equals(1));
     return completer.future;  // Wait for breakpoint events.
   });
 },
 
 ];
 
 main(args) => runIsolateTests(args, tests, testeeConcurrent: testFunction);