SDK fixes

test/generated_sdk/lib/async/broadcast_stream_controller.dart

Index: test/generated_sdk/lib/async/broadcast_stream_controller.dart
diff --git a/test/generated_sdk/lib/async/broadcast_stream_controller.dart b/test/generated_sdk/lib/async/broadcast_stream_controller.dart
index c2cd4ab6c1c26f544961330d68b95ece2a24f41f..e71d3a3deeaca3b83b2a75cf8ebedee030e08762 100644
--- a/test/generated_sdk/lib/async/broadcast_stream_controller.dart
+++ b/test/generated_sdk/lib/async/broadcast_stream_controller.dart
@@ -37,7 +37,7 @@ class _BroadcastSubscription<T> extends _ControllerSubscription<T>
     _next = _previous = this;
   }
 
-  _BroadcastStreamController get _controller => super._controller;
+  _BroadcastStreamController<T> get _controller => super._controller;
 
   bool _expectsEvent(int eventId) =>
       (_eventState & _STATE_EVENT_ID) == eventId;
@@ -201,7 +201,7 @@ abstract class _BroadcastStreamController<T>
     return subscription;
   }
 
-  Future _recordCancel(_BroadcastSubscription<T> subscription) {
+  Future _recordCancel(StreamSubscription<T> subscription) {
     // If already removed by the stream, don't remove it again.
     if (identical(subscription._next, subscription)) return null;
     assert(!identical(subscription._next, subscription));