Dart: Futures -> Callbacks.

mojo/dart/packages/_mojo_for_test_only/lib/test/pingpong_service.mojom.dart

Index: mojo/dart/packages/_mojo_for_test_only/lib/test/pingpong_service.mojom.dart
diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/test/pingpong_service.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/test/pingpong_service.mojom.dart
index cf46808835d00930b1877ddb9d116afa25d28344..b841a1df87dd8507114184277665d6522e847cf0 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/test/pingpong_service.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/test/pingpong_service.mojom.dart
@@ -23,6 +23,10 @@ class _PingPongServiceSetClientParams extends bindings.Struct {
 
   _PingPongServiceSetClientParams() : super(kVersions.last.size);
 
+  _PingPongServiceSetClientParams.init(
+    PingPongClientInterface this.client
+  ) : super(kVersions.last.size);
+
   static _PingPongServiceSetClientParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -94,6 +98,10 @@ class _PingPongServicePingParams extends bindings.Struct {
 
   _PingPongServicePingParams() : super(kVersions.last.size);
 
+  _PingPongServicePingParams.init(
+    int this.pingValue
+  ) : super(kVersions.last.size);
+
   static _PingPongServicePingParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -167,6 +175,11 @@ class _PingPongServicePingTargetUrlParams extends bindings.Struct {
 
   _PingPongServicePingTargetUrlParams() : super(kVersions.last.size);
 
+  _PingPongServicePingTargetUrlParams.init(
+    String this.url, 
+    int this.count
+  ) : super(kVersions.last.size);
+
   static _PingPongServicePingTargetUrlParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -252,6 +265,10 @@ class PingPongServicePingTargetUrlResponseParams extends bindings.Struct {
 
   PingPongServicePingTargetUrlResponseParams() : super(kVersions.last.size);
 
+  PingPongServicePingTargetUrlResponseParams.init(
+    bool this.ok
+  ) : super(kVersions.last.size);
+
   static PingPongServicePingTargetUrlResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -325,6 +342,11 @@ class _PingPongServicePingTargetServiceParams extends bindings.Struct {
 
   _PingPongServicePingTargetServiceParams() : super(kVersions.last.size);
 
+  _PingPongServicePingTargetServiceParams.init(
+    PingPongServiceInterface this.service, 
+    int this.count
+  ) : super(kVersions.last.size);
+
   static _PingPongServicePingTargetServiceParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -408,6 +430,10 @@ class PingPongServicePingTargetServiceResponseParams extends bindings.Struct {
 
   PingPongServicePingTargetServiceResponseParams() : super(kVersions.last.size);
 
+  PingPongServicePingTargetServiceResponseParams.init(
+    bool this.ok
+  ) : super(kVersions.last.size);
+
   static PingPongServicePingTargetServiceResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -480,6 +506,10 @@ class _PingPongServiceGetPingPongServiceParams extends bindings.Struct {
 
   _PingPongServiceGetPingPongServiceParams() : super(kVersions.last.size);
 
+  _PingPongServiceGetPingPongServiceParams.init(
+    PingPongServiceInterfaceRequest this.service
+  ) : super(kVersions.last.size);
+
   static _PingPongServiceGetPingPongServiceParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -551,6 +581,10 @@ class _PingPongServiceGetPingPongServiceDelayedParams extends bindings.Struct {
 
   _PingPongServiceGetPingPongServiceDelayedParams() : super(kVersions.last.size);
 
+  _PingPongServiceGetPingPongServiceDelayedParams.init(
+    PingPongServiceInterfaceRequest this.service
+  ) : super(kVersions.last.size);
+
   static _PingPongServiceGetPingPongServiceDelayedParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -621,6 +655,9 @@ class _PingPongServiceQuitParams extends bindings.Struct {
 
   _PingPongServiceQuitParams() : super(kVersions.last.size);
 
+  _PingPongServiceQuitParams.init(
+  ) : super(kVersions.last.size);
+
   static _PingPongServiceQuitParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -680,6 +717,10 @@ class _PingPongClientPongParams extends bindings.Struct {
 
   _PingPongClientPongParams() : super(kVersions.last.size);
 
+  _PingPongClientPongParams.init(
+    int this.pongValue
+  ) : super(kVersions.last.size);
+
   static _PingPongClientPongParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -752,17 +793,19 @@ const int _pingPongServiceMethodGetPingPongServiceDelayedName = 5;
 const int _pingPongServiceMethodQuitName = 6;
 
 class _PingPongServiceServiceDescription implements service_describer.ServiceDescription {
-  dynamic getTopLevelInterface([Function responseFactory]){
+  void getTopLevelInterface(Function responder){
     var interfaceTypeKey = getRuntimeTypeInfo().services["test::PingPongService"];
     var userDefinedType = getAllMojomTypeDefinitions()[interfaceTypeKey];
-    return responseFactory(userDefinedType.interfaceType);
+    responder(userDefinedType.interfaceType);
   }
 
-  dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
-    responseFactory(getAllMojomTypeDefinitions()[typeKey]);
+  void getTypeDefinition(String typeKey, Function responder) {
+    responder(getAllMojomTypeDefinitions()[typeKey]);
+  }
 
-  dynamic getAllTypeDefinitions([Function responseFactory]) =>
-    responseFactory(getAllMojomTypeDefinitions());
+  void getAllTypeDefinitions(Function responder) {
+    responder(getAllMojomTypeDefinitions());
+  }
 }
 
 abstract class PingPongService {
@@ -789,8 +832,8 @@ abstract class PingPongService {
   }
   void setClient(PingPongClientInterface client);
   void ping(int pingValue);
-  dynamic pingTargetUrl(String url,int count,[Function responseFactory = null]);
-  dynamic pingTargetService(PingPongServiceInterface service,int count,[Function responseFactory = null]);
+  void pingTargetUrl(String url,int count,void callback(bool ok));
+  void pingTargetService(PingPongServiceInterface service,int count,void callback(bool ok));
   void getPingPongService(PingPongServiceInterfaceRequest service);
   void getPingPongServiceDelayed(PingPongServiceInterfaceRequest service);
   void quit();
@@ -843,18 +886,14 @@ class _PingPongServiceProxyControl
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback(r.ok );
         break;
       case _pingPongServiceMethodPingTargetServiceName:
         var r = PingPongServicePingTargetServiceResponseParams.deserialize(
@@ -863,18 +902,14 @@ class _PingPongServiceProxyControl
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback(r.ok );
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
@@ -947,31 +982,35 @@ class PingPongServiceProxy
     ctrl.sendMessage(params,
         _pingPongServiceMethodPingName);
   }
-  dynamic pingTargetUrl(String url,int count,[Function responseFactory = null]) {
+  void pingTargetUrl(String url,int count,void callback(bool ok)) {
     if (impl != null) {
-      return new Future(() => impl.pingTargetUrl(url,count,_PingPongServiceStubControl._pingPongServicePingTargetUrlResponseParamsFactory));
+      impl.pingTargetUrl(url,count,callback);
+      return;
     }
     var params = new _PingPongServicePingTargetUrlParams();
     params.url = url;
     params.count = count;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _pingPongServiceMethodPingTargetUrlName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic pingTargetService(PingPongServiceInterface service,int count,[Function responseFactory = null]) {
+  void pingTargetService(PingPongServiceInterface service,int count,void callback(bool ok)) {
     if (impl != null) {
-      return new Future(() => impl.pingTargetService(service,count,_PingPongServiceStubControl._pingPongServicePingTargetServiceResponseParamsFactory));
+      impl.pingTargetService(service,count,callback);
+      return;
     }
     var params = new _PingPongServicePingTargetServiceParams();
     params.service = service;
     params.count = count;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _pingPongServiceMethodPingTargetServiceName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
   void getPingPongService(PingPongServiceInterfaceRequest service) {
     if (impl != null) {
@@ -1038,22 +1077,36 @@ class _PingPongServiceStubControl
   String get serviceName => PingPongService.serviceName;
 
 
-  static PingPongServicePingTargetUrlResponseParams _pingPongServicePingTargetUrlResponseParamsFactory(bool ok) {
-    var result = new PingPongServicePingTargetUrlResponseParams();
-    result.ok = ok;
-    return result;
-  }
-  static PingPongServicePingTargetServiceResponseParams _pingPongServicePingTargetServiceResponseParamsFactory(bool ok) {
-    var result = new PingPongServicePingTargetServiceResponseParams();
-    result.ok = ok;
-    return result;
-  }
-
-  dynamic handleMessage(bindings.ServiceMessage message) {
+  Function _pingPongServicePingTargetUrlResponseParamsResponder(
+      int requestId) {
+  return (bool ok) {
+      var result = new PingPongServicePingTargetUrlResponseParams();
+      result.ok = ok;
+      sendResponse(buildResponseWithId(
+          result,
+          _pingPongServiceMethodPingTargetUrlName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
+  }
+  Function _pingPongServicePingTargetServiceResponseParamsResponder(
+      int requestId) {
+  return (bool ok) {
+      var result = new PingPongServicePingTargetServiceResponseParams();
+      result.ok = ok;
+      sendResponse(buildResponseWithId(
+          result,
+          _pingPongServiceMethodPingTargetServiceName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
+  }
+
+  void handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
-      return bindings.ControlMessageHandler.handleMessage(this,
-                                                          0,
-                                                          message);
+      bindings.ControlMessageHandler.handleMessage(
+          this, 0, message);
+      return;
     }
     if (_impl == null) {
       throw new core.MojoApiError("$this has no implementation set");
@@ -1072,46 +1125,12 @@ class _PingPongServiceStubControl
       case _pingPongServiceMethodPingTargetUrlName:
         var params = _PingPongServicePingTargetUrlParams.deserialize(
             message.payload);
-        var response = _impl.pingTargetUrl(params.url,params.count,_pingPongServicePingTargetUrlResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _pingPongServiceMethodPingTargetUrlName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _pingPongServiceMethodPingTargetUrlName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.pingTargetUrl(params.url, params.count, _pingPongServicePingTargetUrlResponseParamsResponder(message.header.requestId));
         break;
       case _pingPongServiceMethodPingTargetServiceName:
         var params = _PingPongServicePingTargetServiceParams.deserialize(
             message.payload);
-        var response = _impl.pingTargetService(params.service,params.count,_pingPongServicePingTargetServiceResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _pingPongServiceMethodPingTargetServiceName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _pingPongServiceMethodPingTargetServiceName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.pingTargetService(params.service, params.count, _pingPongServicePingTargetServiceResponseParamsResponder(message.header.requestId));
         break;
       case _pingPongServiceMethodGetPingPongServiceName:
         var params = _PingPongServiceGetPingPongServiceParams.deserialize(
@@ -1130,7 +1149,6 @@ class _PingPongServiceStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   PingPongService get impl => _impl;
@@ -1190,11 +1208,11 @@ class PingPongServiceStub
   void ping(int pingValue) {
     return impl.ping(pingValue);
   }
-  dynamic pingTargetUrl(String url,int count,[Function responseFactory = null]) {
-    return impl.pingTargetUrl(url,count,responseFactory);
+  void pingTargetUrl(String url,int count,void callback(bool ok)) {
+    return impl.pingTargetUrl(url,count,callback);
   }
-  dynamic pingTargetService(PingPongServiceInterface service,int count,[Function responseFactory = null]) {
-    return impl.pingTargetService(service,count,responseFactory);
+  void pingTargetService(PingPongServiceInterface service,int count,void callback(bool ok)) {
+    return impl.pingTargetService(service,count,callback);
   }
   void getPingPongService(PingPongServiceInterfaceRequest service) {
     return impl.getPingPongService(service);
@@ -1210,14 +1228,17 @@ class PingPongServiceStub
 const int _pingPongClientMethodPongName = 0;
 
 class _PingPongClientServiceDescription implements service_describer.ServiceDescription {
-  dynamic getTopLevelInterface([Function responseFactory]) =>
-      responseFactory(null);
+  void getTopLevelInterface(Function responder) {
+    responder(null);
+  }
 
-  dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
-      responseFactory(null);
+  void getTypeDefinition(String typeKey, Function responder) {
+    responder(null);
+  }
 
-  dynamic getAllTypeDefinitions([Function responseFactory]) =>
-      responseFactory(null);
+  void getAllTypeDefinitions(Function responder) {
+    responder(null);
+  }
 }
 
 abstract class PingPongClient {
@@ -1367,11 +1388,11 @@ class _PingPongClientStubControl
 
 
 
-  dynamic handleMessage(bindings.ServiceMessage message) {
+  void handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
-      return bindings.ControlMessageHandler.handleMessage(this,
-                                                          0,
-                                                          message);
+      bindings.ControlMessageHandler.handleMessage(
+          this, 0, message);
+      return;
     }
     if (_impl == null) {
       throw new core.MojoApiError("$this has no implementation set");
@@ -1386,7 +1407,6 @@ class _PingPongClientStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   PingPongClient get impl => _impl;
@@ -1458,7 +1478,7 @@ mojom_types.RuntimeTypeInfo  _initRuntimeTypeInfo() {
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+xZz1PTThRPUgr9wpdfarX8nILo4AHCjB4YTswIIzM6TlU8cGJiWUswbWqSMuqJI38CR4/+CR79M/wzOHrTXfoWt5vdNumEduN0Zx5ht033vc++9z5vdwtas03B8xye/Pgm09ex5KC/gCWPJUB+sLVVsmuVklurvEHeqV1Ggu8/gHf2D0q7h893D7bIi+vh9/j564xeBjO+Ac8VLPPS333q2KgWxJl/lZknw+lD+j+Gmv1VGC9qrW1Kb+1vc59vcOO/oZU0cbuLZQILb9EcHrsN+AvMDeG4hGUUywmWd1jMhu+Zjlu2HLPiuhUHmcduFZlfPMusuieu6Xvl5j9HlheYVr1OJvJN8vcQ93zTrgXIe2+VkW/W8fR1PP2h34RxnbxYFfsT7f8P/qFJ/IvH91KCjwxfjcGX/T2+ET3IkhL4RPougz/0Grcihxe1v2BEt5u0DYndd8B2Yveahz42sIIi+2nrtf28P2wL8pHGfN6pRfUTGV63IH6u9D21nAYS+/cyxGu/8SowuuuMfnxcnUEQXkjyFsX7Ap7fOP/6LsGL16co4JcRZpzksjEskIlfWlUUiWfuYZlk8iP9ZB58XJLmQ+uW61N+7GQfryfLeyPM+hrATySXZbEMM+s4wqzjZQbG4eXiRPN5nIffnwE8FsT+8uuG4msay39X6x8wLBa2f1SRfExx+BQzH29K7J8BDK7tZ5NyyvJyVuPIPYG8LOPvCfD1MjiNyF/m+ugvGqdPsUNdF7We7Tbf83WUHmMd9Ch1lC2uo8b/9TrKHtRRseoou30dNZ6yOuqaD2B/aMTAy2iDVx6wIP61b3kVFLx9/UKA17RivLiXSYYXaX3UYj8TaKrEWeh8QpfHm95DfhyDurDhOcI4m4Yauh9x1m6/0Skv5brAqR1/jUPdUnYbtUCC033F8pHB9GVxWEioPl2EmoWPQx8r7qP08Z2m9Sb+6H7F/aBJ4+9xiniO5q2fwHOZGDhlmHWQ7X/++hezWRfglleE7ygeX2Py3bYEhyXAIoSDovtBnvfOdDX2hZNw7gEqC/1nRcF9oew8K+r9heo8SnB/kiIepf5aNJKJb3I+PCuJb8qladw/qsKnxL92UsintA3FwGmoDZ/Owl77GQoEp9/iezmV+PQs4XgL49BKqIPz1e54lPQf9tFvjBvi0W7jOcetSzbGOmQF3+PrwrAf7yDH+oyOJHXhnCJxTXE5jxnXexI8HgEmUjwG9yeJxDfxn7VBfEvvT4ZjrMNwhPuTVw1beH+wqNj9yaWW7P0JsVvF+5Oc1rm+Y7/3JwAA///Y0/jDWCcAAA==";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+xazW7TThC3nabNv/33Cwikn0pLQeXQugIOVU+VaEUlEApQDj1VVrqkpk4cbKcCTj32EXrkyCNw5DF4jB65wW4zWzbr3cSO3GSNstJgdhNnZ347M7/Z3Ra0ZpuC5zk8+fFNpq9jyUF/AUseS4D8YGurZNcqJbdWeYu8U7uMBN9/AO/sH5R2D1/sHmyRF9fD7/Hz1xm9DGZ8A54rWOalv/vMsVEtiDP/KjNPhtOH9H8MNfurMF7UWtuU3trf5j7f4MZ/Qytp4nYXywQW3qI5PHYb8BeYG8JxCcsolhMsZSxmw/dMxy1bjllx3YqDzGO3iswvnmVW3Q/uY9P3ylf/M48sLzCtep3M5Jvk30Pc8027FiDvvVVGvlnH89fx/Id+E8d18mJVqAft/w/+oUn8i8f3UoKPDF+NwZf9Pb4RPciSEvhE+i6DP/QatyKHF7W/YES3m7QNid13wHZi95qHPjawfiL7aeu1/bw/bAvykcZ83qlF9RMZXrcgfq7UPbWcBhLny2WI137jVWB01xn9+Lg6gyC8kOQtivcFPL9x/vVdghevT1HALyPMOMllY1ggE7+yqigSz9zDMsnkR/rJPPi4JM2H1i3Xp/zYyT5eT5b3Rpj1NYCfSC7LYhlm1nGEWcfLDIzDy8WJ5vM4D78/A3gsiP3l1w3F1zSW/67WP2BYLGz/qCL5mOLwKWY+3pTYPwMYXNvPJuWU5eWsxpF7AnlZxt8T4OtlcBqRv8z10V80Tp9ih7ouaj3bbb7n6yg9xjroUeooW1xHjf/rdZQ9qKNi1VF2+zpqPGV11DUfwP7QiIGX0QavPGBB/Gvf8iooePfmpQCvacV4cS+TDC/S+qjFfibQVImz0PmELo83vYf8OAZ1YcNzhHE2DTV0P+Ks3X6jU17KdYFTO/4ah7ql7DZqgQSn+4rlI4Ppy+KwkFB9ugg1Cx+HPtbbR+njO03rTfzR/Yp7oknj70mKeI7mrZ/Ac5kYOGWYdZDtf/76F7NZF+CWV4TvKB5fY/LdtgSHJcAihIOi+0Ge9850NfaFk3DuARoL/WdFwX2h7Dwr6v2F6jxKcH+aIh6l/lo0kolvcj48K4lvyqVp3D+qwqfEv3ZSyKe0DcXAaagNn87CXvs5CgSn3+J7OZX49CzheAvj0Eqog/PV7niU9B/20W+MG+LRbuM5x61LNsY6ZAXf4+vCsB/vIMf6jI4kdeGcInFNcTmPGdd7EjweASZSPAb3J4nEN/GftUF8S+9PhmOsw3CE+5PXDVt4f7Co2P3JpZbs/QmxW8X7k5zk7xkKkn3UnwAAAP//RrpkZ1gnAAA=";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);