Dart: Futures -> Callbacks.

mojo/dart/apptests/dart_apptests/lib/src/service_describer_apptests.dart

 // Copyright 2016 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 service_describer_apptests;
 
 import 'dart:async';
 
 import 'package:mojo_apptest/apptest.dart';
 import 'package:mojo/application.dart';
@@ skipping 21 matching lines @@
       var serviceDescription =
           new service_describer.ServiceDescriptionInterfaceRequest();
       serviceDescription.ctrl.errorFuture.then(
           (v) => fail('There was an error $v'));
 
       serviceDescriber.describeService(
           "test::PingPongService", serviceDescription);
 
       // Compare the service description obtained by the service describer and
       // the expected description taken from the pingpong service import.
-      var serviceDescription2 = pingpong_service.PingPongService.
-        serviceDescription;
+      var serviceDescription2 =
+          pingpong_service.PingPongService.serviceDescription;
 
-      Function identity = (v) => v;
+      Object sdValue;
+      Function sdValueAssign = (v) => sdValue = v;
 
       // Top-level Mojom Interfaces must match.
+      var c = new Completer();
+      serviceDescription.getTopLevelInterface(
+          (mojom_types.MojomInterface iface) {
+        c.complete(iface);
+      });
+
       mojom_types.MojomInterface interfaceA =
-          (await serviceDescription.responseOrError(
-              serviceDescription.getTopLevelInterface())).mojomInterface;
+          (await serviceDescription.responseOrError(c.future));
 
-      mojom_types.MojomInterface interfaceB = serviceDescription2.
-          getTopLevelInterface(identity);
+      serviceDescription2.getTopLevelInterface(sdValueAssign);
+      mojom_types.MojomInterface interfaceB = sdValue;
       _compare(interfaceA, interfaceB);
 
       // Get the type key for the type of the first parameter of the
       // first method of the interface.
       mojom_types.MojomMethod setClientMethod = interfaceA.methods[0];
       mojom_types.StructField firstParam = setClientMethod.parameters.fields[0];
       String typeKey = firstParam.type.typeReference.typeKey;
 
       // Use getTypeDefinition() to get the type and check that it
       // is named "PingPongClient".
+      c = new Completer();
+      serviceDescription.getTypeDefinition(typeKey,
+          (mojom_types.UserDefinedType type) {
+        c.complete(type);
+      });
       mojom_types.MojomInterface pingPongClientInterface =
-         (await serviceDescription.responseOrError(
-              serviceDescription.getTypeDefinition(typeKey))).type.
-             interfaceType;
+          (await serviceDescription.responseOrError(c.future)).interfaceType;
       expect(pingPongClientInterface.declData.shortName,
           equals("PingPongClient"));
 
       // Check that the mojom type definitions match between mappings.
       // For simplicity, check in a shallow manner.
-      var actualDescriptions = (await serviceDescription.responseOrError(
-          serviceDescription.getAllTypeDefinitions())).definitions;
-      var expectedDescriptions = serviceDescription2.
-          getAllTypeDefinitions(identity);
+      c = new Completer();
+      serviceDescription.getAllTypeDefinitions(
+          (Map<String, mojom_types.UserDefinedType> definitions) {
+        c.complete(definitions);
+      });
+
+      var actualDescriptions =
+          (await serviceDescription.responseOrError(c.future));
+      serviceDescription2.getAllTypeDefinitions(sdValueAssign);
+      var expectedDescriptions = sdValue;
       actualDescriptions.keys.forEach((String key) {
         var a = actualDescriptions[key];
         var e = expectedDescriptions[key];
         expect(e, isNotNull);
         expect(a.runtimeType, equals(e.runtimeType));
       });
 
       await serviceDescription.close();
       await serviceDescriber.close();
     });
@@ skipping 25 matching lines @@
     expect(methodA.parameters.fields.length,
         equals(methodB.parameters.fields.length));
     mojom_types.MojomStruct responseA = methodA.responseParams;
     mojom_types.MojomStruct responseB = methodB.responseParams;
     expect(responseA == null, equals(responseB == null));
     if (responseA != null) {
       expect(responseA.fields.length, equals(responseB.fields.length));
     }
   });
 }