Fix field override error

This fixes the following error reported by https://codereview.chromium.org/1430953004/ (not landed yet):

severe: [InvalidFieldOverride] Field declaration _ControllerSubscription<T>._controller cannot be overridden in _BroadcastSubscription. (dart:async/broadcast_stream_controller.dart, line 40, col 3)

Devon: this should address dart-atom/atom-flutter#2

[email protected]

Review URL: https://codereview.chromium.org/1413303005 .

Author: vsmenon

lib/runtime/dart/async.js

@@ -1260,9 +1260,6 @@ dart_library.library('dart/async', null, /* Imports */[
         super._ControllerSubscription(dart.as(controller, _StreamControllerLifecycle$(T)), onData, onError, onDone, cancelOnError);
         this[_next] = this[_previous] = this;
       }
-      get [_controller]() {
-        return dart.as(super[_controller], _BroadcastStreamController$(T));
-      }
       [_expectsEvent](eventId) {
         return (dart.notNull(this[_eventState]) & dart.notNull(_BroadcastSubscription$()._STATE_EVENT_ID)) == eventId;
       }

tool/input_sdk/lib/async/broadcast_stream_controller.dart

@@ -37,8 +37,6 @@ class _BroadcastSubscription<T> extends _ControllerSubscription<T>
     _next = _previous = this;
   }
 
-  _BroadcastStreamController<T> get _controller => super._controller;
-
   bool _expectsEvent(int eventId) =>
       (_eventState & _STATE_EVENT_ID) == eventId;
 

tool/sdk_expected_errors.txt

@@ -25,13 +25,13 @@ warning: [DownCastComposite] match (List<dynamic>) will need runtime check to ca
 warning: [DownCastComposite] pattern.allMatches(receiver) (dynamic) will need runtime check to cast to type Iterable<Match> (dart:_js_helper/string_helper.dart, line 137, col 23)
 warning: [DownCastComposite] controller (_StreamControllerLifecycle<dynamic>) will need runtime check to cast to type _StreamControllerLifecycle<T> (dart:async/broadcast_stream_controller.dart, line 8, col 67)
 warning: [DownCastComposite] controller (_StreamControllerLifecycle<dynamic>) will need runtime check to cast to type _StreamControllerLifecycle<T> (dart:async/broadcast_stream_controller.dart, line 36, col 15)
-warning: [DownCastComposite] subscription (StreamSubscription<dynamic>) will need runtime check to cast to type _BroadcastSubscription<T> (dart:async/broadcast_stream_controller.dart, line 196, col 18)
-warning: [DownCastComposite] subscription (StreamSubscription<dynamic>) will need runtime check to cast to type StreamSubscription<T> (dart:async/broadcast_stream_controller.dart, line 201, col 12)
-warning: [DownCastComposite] link (_BroadcastSubscriptionLink) will need runtime check to cast to type _BroadcastSubscription<T> (dart:async/broadcast_stream_controller.dart, line 310, col 48)
-warning: [UninferredClosure] (_BroadcastSubscription<T> subscription) {subscription._close();} ((_BroadcastSubscription<T>) → dynamic) will need runtime check to cast to type (_BufferingStreamSubscription<T>) → void (dart:async/broadcast_stream_controller.dart, line 373, col 24)
-warning: [DownCastComposite] link (_BroadcastSubscriptionLink) will need runtime check to cast to type _BroadcastSubscription<T> (dart:async/broadcast_stream_controller.dart, line 394, col 48)
-warning: [DownCastComposite] link (_BroadcastSubscriptionLink) will need runtime check to cast to type _BroadcastSubscription<T> (dart:async/broadcast_stream_controller.dart, line 403, col 48)
-warning: [DownCastComposite] link (_BroadcastSubscriptionLink) will need runtime check to cast to type _BroadcastSubscription<T> (dart:async/broadcast_stream_controller.dart, line 413, col 50)
+warning: [DownCastComposite] subscription (StreamSubscription<dynamic>) will need runtime check to cast to type _BroadcastSubscription<T> (dart:async/broadcast_stream_controller.dart, line 194, col 18)
+warning: [DownCastComposite] subscription (StreamSubscription<dynamic>) will need runtime check to cast to type StreamSubscription<T> (dart:async/broadcast_stream_controller.dart, line 199, col 12)
+warning: [DownCastComposite] link (_BroadcastSubscriptionLink) will need runtime check to cast to type _BroadcastSubscription<T> (dart:async/broadcast_stream_controller.dart, line 308, col 48)
+warning: [UninferredClosure] (_BroadcastSubscription<T> subscription) {subscription._close();} ((_BroadcastSubscription<T>) → dynamic) will need runtime check to cast to type (_BufferingStreamSubscription<T>) → void (dart:async/broadcast_stream_controller.dart, line 371, col 24)
+warning: [DownCastComposite] link (_BroadcastSubscriptionLink) will need runtime check to cast to type _BroadcastSubscription<T> (dart:async/broadcast_stream_controller.dart, line 392, col 48)
+warning: [DownCastComposite] link (_BroadcastSubscriptionLink) will need runtime check to cast to type _BroadcastSubscription<T> (dart:async/broadcast_stream_controller.dart, line 401, col 48)
+warning: [DownCastComposite] link (_BroadcastSubscriptionLink) will need runtime check to cast to type _BroadcastSubscription<T> (dart:async/broadcast_stream_controller.dart, line 411, col 50)
 warning: [DownCastComposite] result (_Future<dynamic>) will need runtime check to cast to type Future<T> (dart:async/future.dart, line 123, col 12)
 warning: [DownCastComposite] result (_Future<dynamic>) will need runtime check to cast to type Future<T> (dart:async/future.dart, line 149, col 12)
 warning: [DownCastComposite] result (_Future<dynamic>) will need runtime check to cast to type Future<T> (dart:async/future.dart, line 233, col 12)