Dart: Futures -> Callbacks.

mojo/dart/apptests/dart_apptests/lib/src/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.
 
 library pingpong_apptests;
 
 import 'dart:async';
 
 import 'package:mojo_apptest/apptest.dart';
 import 'package:mojo/application.dart';
@@ skipping 45 matching lines @@
     });
 
     // 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 {
       var pingPongService = new PingPongServiceInterfaceRequest();
       pingPongService.ctrl.errorFuture.then((e) => fail('$e'));
       application.connectToService("mojo:dart_pingpong", pingPongService);
 
-      var r = await pingPongService.pingTargetUrl(
-          "mojo:dart_pingpong_target", 9);
-      expect(r.ok, equals(true));
+      var c = new Completer();
+      pingPongService.pingTargetUrl("mojo:dart_pingpong_target", 9, (bool ok) {
+        c.complete(ok);
+      });
+      expect(await pingPongService.responseOrError(c.future), isTrue);
+
+      // var r = await pingPongService.pingTargetUrl(
+      //     "mojo:dart_pingpong_target", 9);
+      // expect(r.ok, equals(true));
 
       await pingPongService.close();
     });
 
     // 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 {
       var pingPongService = new PingPongServiceInterfaceRequest();
       pingPongService.ctrl.errorFuture.then((e) => fail('$e'));
       application.connectToService("mojo:dart_pingpong", pingPongService);
 
       var targetService = new PingPongServiceInterfaceRequest();
       targetService.ctrl.errorFuture.then((e) => fail('$e'));
       application.connectToService("mojo:dart_pingpong_target", targetService);
 
-      var r = await pingPongService.pingTargetService(targetService, 9);
-      expect(r.ok, equals(true));
+      var c = new Completer();
+      pingPongService.pingTargetService(targetService, 9, (bool ok) {
+        c.complete(ok);
+      });
+      expect(await pingPongService.responseOrError(c.future), isTrue);
+
+      //var r = await pingPongService.pingTargetService(targetService, 9);
+      //expect(r.ok, equals(true));
+
       // This side no longer has access to the pipe.
       expect(targetService.ctrl.isOpen, equals(false));
       expect(targetService.ctrl.isBound, equals(false));
 
       await pingPongService.close();
     });
 
     // Verify that Dart can implement an interface "request" parameter.
     test('Get Target Service', () async {
       var pingPongService = new PingPongServiceInterfaceRequest();
@@ skipping 42 matching lines @@
       targetService.ping(100);
       pongValue = await pingPongClient.waitForPong();
       expect(pongValue, equals(101));
 
       await pingPongClient.client.close();
       await targetService.close();
       await pingPongService.close();
     });
   });
 }