Revert "Add the streamListen and streamCancel rpcs to the vm service."

runtime/observatory/tests/service/async_generator_breakpoint_test.dart

Index: runtime/observatory/tests/service/async_generator_breakpoint_test.dart
diff --git a/runtime/observatory/tests/service/async_generator_breakpoint_test.dart b/runtime/observatory/tests/service/async_generator_breakpoint_test.dart
index fbb84a94a60e4f5ef57abec2ee856b5ac428f6b1..123edcd83c14031391320e927cd89e85e7332794 100644
--- a/runtime/observatory/tests/service/async_generator_breakpoint_test.dart
+++ b/runtime/observatory/tests/service/async_generator_breakpoint_test.dart
@@ -5,19 +5,18 @@
 
 import 'package:observatory/service_io.dart';
 import 'package:unittest/unittest.dart';
-import 'dart:async';
 import 'test_helper.dart';
 
-printSync() {  // Line 11
+printSync() {  // Line 10
   print('sync');
 }
-printAsync() async {  // Line 14
+printAsync() async {  // Line 13
   print('async');
 }
-printAsyncStar() async* {  // Line 17
+printAsyncStar() async* {  // Line 16
   print('async*');
 }
-printSyncStar() sync* {  // Line 20
+printSyncStar() sync* {  // Line 19
   print('sync*');
 }
 
@@ -35,7 +34,7 @@ testeeDo() {
   var stream = printAsyncStar();
   var iterator = printSyncStar();
 
-  print('middle');  // Line 38
+  print('middle');  // Line 37.
 
   future.then((v) => print(v));
   stream.toList();
@@ -46,45 +45,41 @@ testAsync(Isolate isolate) async {
   await isolate.rootLibrary.load();
   var script = isolate.rootLibrary.scripts[0];
 
-  var bp1 = await isolate.addBreakpoint(script, 11);
+  var bp1 = await isolate.addBreakpoint(script, 10);
   expect(bp1, isNotNull);
   expect(bp1 is Breakpoint, isTrue);
-  var bp2 = await isolate.addBreakpoint(script, 14);
+  var bp2 = await isolate.addBreakpoint(script, 13);
   expect(bp2, isNotNull);
   expect(bp2 is Breakpoint, isTrue);
-  var bp3 = await isolate.addBreakpoint(script, 17);
+  var bp3 = await isolate.addBreakpoint(script, 16);
   expect(bp3, isNotNull);
   expect(bp3 is Breakpoint, isTrue);
-  var bp4 = await isolate.addBreakpoint(script, 20);
+  var bp4 = await isolate.addBreakpoint(script, 19);
   expect(bp4, isNotNull);
   expect(bp4 is Breakpoint, isTrue);
-  var bp5 = await isolate.addBreakpoint(script, 38);
+  var bp5 = await isolate.addBreakpoint(script, 37);
   print("BP5 - $bp5");
   expect(bp5, isNotNull);
   expect(bp5 is Breakpoint, isTrue);
 
   var hits = [];
 
-  Completer completer = new Completer();
-  isolate.vm.debugEvents.listen((ServiceEvent event) {
+  isolate.rootLibrary.evaluate('testerReady = true;')
+      .then((Instance result) {
+        expect(result.valueAsString, equals('true'));
+      });
+
+  await for (ServiceEvent event in isolate.vm.events.stream) {
     if (event.eventType == ServiceEvent.kPauseBreakpoint) {
       var bp = event.breakpoint;
       print('Hit $bp');
       hits.add(bp);
       isolate.resume();
 
-      if (hits.length == 5) {
-        completer.complete();
-      }
+      if (hits.length == 5) break;
     }
-  });
-
-  isolate.rootLibrary.evaluate('testerReady = true;')
-      .then((Instance result) {
-        expect(result.valueAsString, equals('true'));
-      });
+  }
 
-  await completer.future;
   expect(hits, equals([bp1, bp5, bp4, bp2, bp3]));
 }