Misc Observatory patches:

runtime/observatory/tests/service/break_on_activation_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';
 
 genRepeater(value) {
   return () => print(value);
 }
 
 genRepeaterNamed(value) {
   return ({x, y}) => print(value);
 }
 
 var r1;
@@ skipping 44 matching lines @@
     }
   });
 
   valueOfField(String name) async {
     var field = rootLib.variables.singleWhere((v) => v.name == name);
     await field.load();
     return field.staticValue;
 
   }
   var r1Ref = await valueOfField('r1');
-  var r2Ref = await valueOfField('r2');
-  var r3Ref = await valueOfField('r3');
 
   var bpt1 = await isolate.addBreakOnActivation(r1Ref);
   print("Added breakpoint $bpt1");
   expect(bpt1 is Breakpoint, isTrue);
   expect(breaksHit, equals(0));
   print("testeeDo()");
   var res = await rootLib.evaluate("testeeDo()");
   expect(res is Instance, isTrue); // Not error.
   expect(breaksHit, equals(1));
 
@@ skipping 20 matching lines @@
       isolate.resume();
     }
   });
 
   valueOfField(String name) async {
     var field = rootLib.variables.singleWhere((v) => v.name == name);
     await field.load();
     return field.staticValue;
   }
   var r1Ref = await valueOfField('r1_named');
-  var r2Ref = await valueOfField('r2_named');
-  var r3Ref = await valueOfField('r3_named');
 
   var bpt1 = await isolate.addBreakOnActivation(r1Ref);
   print("Added breakpoint $bpt1");
   expect(bpt1 is Breakpoint, isTrue);
   expect(breaksHit, equals(0));
   print("testeeDoNamed()");
   var res = await rootLib.evaluate("testeeDoNamed()");
   expect(res is Instance, isTrue); // Not error.
   expect(breaksHit, equals(1));
 
@@ skipping 21 matching lines @@
     }
   });
 
   valueOfField(String name) async {
     var field = rootLib.variables.singleWhere((v) => v.name == name);
     await field.load();
     return field.staticValue;
   }
   var r1Ref = await valueOfField('r1');
   var r2Ref = await valueOfField('r2');
-  var r3Ref = await valueOfField('r3');
 
   var bpt1 = await isolate.addBreakOnActivation(r1Ref);
   print("Added breakpoint $bpt1");
   expect(bpt1 is Breakpoint, isTrue);
   expect(breaksHit, equals(0));
   print("testeeDo()");
   var res = await rootLib.evaluate("testeeDo()");
   expect(res is Instance, isTrue); // Not error.
   expect(breaksHit, equals(1));
 
@@ skipping 19 matching lines @@
   res = await rootLib.evaluate("testeeDo()");
   expect(res is Instance, isTrue); // Not error.
   expect(breaksHit, equals(4));
 
   await subscription.cancel();
 },
 
 ];
 
 main(args) => runIsolateTests(args, tests, testeeBefore: testeeSetup);