Removing deprecated events syntax.

tools/dom/src/Isolates.dart

 // Copyright (c) 2012, 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.
 
 part of html;
 
 _serialize(var message) {
   return new _JsSerializer().traverse(message);
 }
 
@@ skipping 81 matching lines @@
     var result = _call(_isolateId, _portId, serialized);
     return _deserialize(result);
   }
 
   static _call(int isolateId, int portId, var message) {
     var target = 'dart-port-$isolateId-$portId';
     // TODO(vsm): Make this re-entrant.
     // TODO(vsm): Set this up set once, on the first call.
     var source = '$target-result';
     var result = null;
-    var listener = (Event e) {
+    window.on[source].first.then((Event e) {
       result = json.parse(_getPortSyncEventData(e));
-    };
-    window.on[source].add(listener);
+    });
     _dispatchEvent(target, [source, message]);
-    window.on[source].remove(listener);
     return result;
   }
 
   bool operator==(var other) {
     return (other is _RemoteSendPortSync) && (_isolateId == other._isolateId)
       && (_portId == other._portId);
   }
 
   int get hashCode => _isolateId >> 16 + _portId;
 }
@@ skipping 34 matching lines @@
 // ReceivePortSync directly.  Across isolates (or from JS), an
 // EventListener can be used to communicate with the port indirectly.
 class ReceivePortSync {
 
   static Map<int, ReceivePortSync> _portMap;
   static int _portIdCount;
   static int _cachedIsolateId;
 
   num _portId;
   Function _callback;
-  EventListener _listener;
+  StreamSubscription _portSubscription;
 
   ReceivePortSync() {
     if (_portIdCount == null) {
       _portIdCount = 0;
       _portMap = new Map<int, ReceivePortSync>();
     }
     _portId = _portIdCount++;
     _portMap[_portId] = this;
   }
 
   static int get _isolateId {
     // TODO(vsm): Make this coherent with existing isolate code.
     if (_cachedIsolateId == null) {
       _cachedIsolateId = _getNewIsolateId();
     }
     return _cachedIsolateId;
   }
 
   static String _getListenerName(isolateId, portId) =>
       'dart-port-$isolateId-$portId';
   String get _listenerName => _getListenerName(_isolateId, _portId);
 
   void receive(callback(var message)) {
     _callback = callback;
-    if (_listener == null) {
-      _listener = (Event e) {
+    if (_portSubscription == null) {
+      _portSubscription = window.on[_listenerName].listen((Event e) {
         var data = json.parse(_getPortSyncEventData(e));
         var replyTo = data[0];
         var message = _deserialize(data[1]);
         var result = _callback(message);
         _dispatchEvent(replyTo, _serialize(result));
-      };
-      window.on[_listenerName].add(_listener);
+      });
     }
   }
 
   void close() {
     _portMap.remove(_portId);
-    if (_listener != null) window.on[_listenerName].remove(_listener);
+    if (_portSubscription != null) _portSubscription.cancel();
   }
 
   SendPortSync toSendPort() {
     return new _LocalSendPortSync._internal(this);
   }
 
   static SendPortSync _lookup(int isolateId, int portId) {
     if (isolateId == _isolateId) {
       return _portMap[portId].toSendPort();
     } else {
       return new _RemoteSendPortSync(isolateId, portId);
     }
   }
 }
 
 get _isolateId => ReceivePortSync._isolateId;
 
 void _dispatchEvent(String receiver, var message) {
   var event = new CustomEvent(receiver, canBubble: false, cancelable:false,
     detail: json.stringify(message));
   window.dispatchEvent(event);
 }
 
 String _getPortSyncEventData(CustomEvent event) => event.detail;