Dart: Fixes bug in MojoEventStreamListener

services/dart/dart_apptests/pingpong_apptests.dart

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 import 'dart:async';
 import 'mojo:application';
 import 'mojo:bindings';
 import 'mojo:core';
 
 import 'package:apptest/apptest.dart';
@@ skipping 15 matching lines @@
   void pong(int pongValue) {
     _completer.complete(pongValue);
     _completer = null;
   }
 }
 
 pingpongApptests(Application application) {
   group('Ping-Pong Service Apptests', () {
     // Verify that "pingpong.dart" implements the PingPongService interface
     // and sends responses to our client.
-    test('Ping Service To Pong Client', () { (() async {
+    test('Ping Service To Pong Client', () async {
       var pingPongServiceProxy = new PingPongServiceProxy.unbound();
       application.connectToService("mojo:dart_pingpong", pingPongServiceProxy);
 
       var pingPongClient = new _TestingPingPongClient.unbound();
       pingPongServiceProxy.ptr.setClient(pingPongClient.stub);
       pingPongClient.stub.listen();
 
       pingPongServiceProxy.ptr.ping(1);
       var pongValue = await pingPongClient.waitForPong();
       expect(pongValue, equals(2));
 
       pingPongServiceProxy.ptr.ping(100);
       pongValue = await pingPongClient.waitForPong();
       expect(pongValue, equals(101));
 
       pingPongClient.stub.close();
       pingPongServiceProxy.close();
-    })().then(expectAsync((_) => null));});
+    });
 
     // Verify that "pingpong.dart" can connect to "pingpong_target.dart", act as
     // its client, and return a Future that only resolves after the
     // target.ping() => client.pong() methods have executed 9 times.
-    test('Ping Target URL', () { (() async {
+    test('Ping Target URL', () async {
       var pingPongServiceProxy = new PingPongServiceProxy.unbound();
       application.connectToService("mojo:dart_pingpong", pingPongServiceProxy);
 
       var r = await pingPongServiceProxy.ptr.pingTargetUrl(
           "mojo:dart_pingpong_target", 9);
       expect(r.ok, equals(true));
 
       pingPongServiceProxy.close();
-    })().then(expectAsync((_) => null));});
+    });
 
     // Same as the previous test except that instead of providing the
     // pingpong_target.dart URL, we provide a connection to its PingPongService.
-    test('Ping Target Service', () { (() async {
+    test('Ping Target Service', () async {
       var pingPongServiceProxy = new PingPongServiceProxy.unbound();
       application.connectToService("mojo:dart_pingpong", pingPongServiceProxy);
 
       var targetServiceProxy = new PingPongServiceProxy.unbound();
       application.connectToService(
           "mojo:dart_pingpong_target",
           targetServiceProxy);
 
       // TODO(erg): The dart bindings can't currently pass a proxy that we've
       // received from another service and pass it it as a parameter to a call
       // to another service. Uncomment this once this works.
       //
       // var r = await pingPongServiceProxy.ptr.pingTargetService(
       //    targetServiceProxy.impl, 9);
       // expect(r.ok, equals(true));
 
       targetServiceProxy.close();
       pingPongServiceProxy.close();
-    })().then(expectAsync((_) => null));});
+    });
 
     // Verify that Dart can implement an interface "request" parameter.
-    test('Get Target Service', () { (() async {
+    test('Get Target Service', () async {
       var pingPongServiceProxy = new PingPongServiceProxy.unbound();
       application.connectToService("mojo:dart_pingpong", pingPongServiceProxy);
 
       var targetServiceProxy = new PingPongServiceProxy.unbound();
       pingPongServiceProxy.ptr.getPingPongService(targetServiceProxy);
 
       var pingPongClient = new _TestingPingPongClient.unbound();
       targetServiceProxy.ptr.setClient(pingPongClient.stub);
       pingPongClient.stub.listen();
 
       targetServiceProxy.ptr.ping(1);
       var pongValue = await pingPongClient.waitForPong();
       expect(pongValue, equals(2));
 
       targetServiceProxy.ptr.ping(100);
       pongValue = await pingPongClient.waitForPong();
       expect(pongValue, equals(101));
 
       pingPongClient.stub.close();
       targetServiceProxy.close();
       pingPongServiceProxy.close();
-    })().then(expectAsync((_) => null));});
+    });
   });
 }