Dart: Futures -> Callbacks.

mojo/dart/packages/_mojo_for_test_only/lib/dart_to_cpp/dart_to_cpp.mojom.dart

Index: mojo/dart/packages/_mojo_for_test_only/lib/dart_to_cpp/dart_to_cpp.mojom.dart
diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/dart_to_cpp/dart_to_cpp.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/dart_to_cpp/dart_to_cpp.mojom.dart
index 64135b9120d6648de64ba4750c68efe0ee53b8f0..1f3da00f4e7abade6f121f14647fb254e7a0f9fd 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/dart_to_cpp/dart_to_cpp.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/dart_to_cpp/dart_to_cpp.mojom.dart
@@ -40,6 +40,27 @@ class EchoArgs extends bindings.Struct {
 
   EchoArgs() : super(kVersions.last.size);
 
+  EchoArgs.init(
+    int this.si64, 
+    int this.si32, 
+    int this.si16, 
+    int this.si8, 
+    int this.ui8, 
+    int this.ui64, 
+    int this.ui32, 
+    int this.ui16, 
+    double this.floatVal, 
+    double this.floatInf, 
+    double this.floatNan, 
+    core.MojoMessagePipeEndpoint this.messageHandle, 
+    double this.doubleVal, 
+    double this.doubleInf, 
+    double this.doubleNan, 
+    String this.name, 
+    List<String> this.stringArray, 
+    core.MojoDataPipeConsumer this.dataHandle
+  ) : super(kVersions.last.size);
+
   static EchoArgs deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -333,6 +354,11 @@ class EchoArgsList extends bindings.Struct {
 
   EchoArgsList() : super(kVersions.last.size);
 
+  EchoArgsList.init(
+    EchoArgsList this.next, 
+    EchoArgs this.item
+  ) : super(kVersions.last.size);
+
   static EchoArgsList deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -417,6 +443,9 @@ class _CppSideStartTestParams extends bindings.Struct {
 
   _CppSideStartTestParams() : super(kVersions.last.size);
 
+  _CppSideStartTestParams.init(
+  ) : super(kVersions.last.size);
+
   static _CppSideStartTestParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -475,6 +504,9 @@ class _CppSideTestFinishedParams extends bindings.Struct {
 
   _CppSideTestFinishedParams() : super(kVersions.last.size);
 
+  _CppSideTestFinishedParams.init(
+  ) : super(kVersions.last.size);
+
   static _CppSideTestFinishedParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -533,6 +565,9 @@ class _CppSidePingResponseParams extends bindings.Struct {
 
   _CppSidePingResponseParams() : super(kVersions.last.size);
 
+  _CppSidePingResponseParams.init(
+  ) : super(kVersions.last.size);
+
   static _CppSidePingResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -592,6 +627,10 @@ class _CppSideEchoResponseParams extends bindings.Struct {
 
   _CppSideEchoResponseParams() : super(kVersions.last.size);
 
+  _CppSideEchoResponseParams.init(
+    EchoArgsList this.list
+  ) : super(kVersions.last.size);
+
   static _CppSideEchoResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -664,6 +703,10 @@ class _DartSideSetClientParams extends bindings.Struct {
 
   _DartSideSetClientParams() : super(kVersions.last.size);
 
+  _DartSideSetClientParams.init(
+    CppSideInterface this.cppSide
+  ) : super(kVersions.last.size);
+
   static _DartSideSetClientParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -734,6 +777,9 @@ class _DartSidePingParams extends bindings.Struct {
 
   _DartSidePingParams() : super(kVersions.last.size);
 
+  _DartSidePingParams.init(
+  ) : super(kVersions.last.size);
+
   static _DartSidePingParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -794,6 +840,11 @@ class _DartSideEchoParams extends bindings.Struct {
 
   _DartSideEchoParams() : super(kVersions.last.size);
 
+  _DartSideEchoParams.init(
+    int this.numIterations, 
+    EchoArgs this.arg
+  ) : super(kVersions.last.size);
+
   static _DartSideEchoParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -875,14 +926,17 @@ const int _cppSideMethodPingResponseName = 100000000;
 const int _cppSideMethodEchoResponseName = 100000001;
 
 class _CppSideServiceDescription 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 CppSide {
@@ -1074,11 +1128,11 @@ class _CppSideStubControl
 
 
 
-  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");
@@ -1102,7 +1156,6 @@ class _CppSideStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   CppSide get impl => _impl;
@@ -1175,14 +1228,17 @@ const int _dartSideMethodPingName = 1;
 const int _dartSideMethodEchoName = 2;
 
 class _DartSideServiceDescription 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 DartSide {
@@ -1362,11 +1418,11 @@ class _DartSideStubControl
 
 
 
-  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");
@@ -1389,7 +1445,6 @@ class _DartSideStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   DartSide get impl => _impl;
@@ -1467,7 +1522,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/9yaPWzbRhTHSUqyJVmy5a9EbdNUBRLULWrT+UAgdFKRunDRDEYTFPGkMNJFYiGRKkkVaaeMHTtmzNgxY8eOGTtmTLeMWQJkc++qR/l8vjudCIU6iMDD6cxLeO/H/717d8eqMboqUO5Dyf49LvNMybZ7CeUOtiy2GtQbUD6A8gmUV7Bdwnbv+Oig+f3B8VdtJ4iakd9sDQZ7tweDu24bkXZXsX0savcN/g0Npe0OWl3/66AT4vufY/t0Urs7bhhBPw/BH+JnBlud8pvUX66c1k1szy6ere/snnIxKC7jyzxbbTC34/cSP/cErkODf61hW8YWI/wI/97EJsB77j0SjkVsDrZjbPYwDOye33J6dsf3Oz1kd/0+sn8LHLvv/+TbYdAa/SAPsIeeG0UojEIb9R+idhsFTVJFgU0/n7TvC3RUo/5OuNd/vJM7efU2Z/z7NmdiY/V1aI3KQXZUPl3i837DcCL/r4w3225fwHsdWwHb3Qg7eA+NdcP69Rk2K0WuNaYfb5hykt+xzuoCvz8A38d+7wbo56HY//hKy/+8cXYcsnHLYNpN0sv/GlThhtuZEr1sYSuR+IO7/63ruWEXtXm8vlgwvVwC32m/acksml5IvFLlZino5cj1Oj+gcOB7IeLx2l1QvdB+L7JezCn0klHQC0llZHrZ00QvA2u2eqH91kkvrE4aTF5H7hMBvDPULhVetO7YqwR5VM/l89kDpmnrwxDkg7Su6RR92nxeNl5N6rlp5esV6Eu8lIl1LFjmnHtP1zTJ17dgPRQjsqj7GerfPYdGL3KK8+iUep+Yp6Pods9FnihPva5JXHxgzThPj/3WLE/XLS7G6+cWrJF5+tjSIC5WBet91X2VpHHwtSAcqnA3FeYjku/xdHljzuPyNVOqjkuVvH6R8lpWH9YUvCwFfZApncfppib6eJyZrT6Ivzrpowqcx/O/KY7bBsTuWcZtEa9tbGVs3rD/He6/E7l4BSDQSTlFXtPOZ/kEXGRxdQXyLyfoGKJxc1Wj+SzOh+PUXXVfXxavLKrOjtt4Aru/Pdt8Pu4aL5+nun3ufRRgPk/rfTzFtoHtj7gOPJ5B4P4T4tlz2F//Cwb037DP/mJ5VP4D4F8VII8tUoGb+FcG/qvAdQ3278Hx39fheRvyeLKU8vo4dG/d5L2nIrznecYRWXyddRw55XHjOo/HiiY8spL+T8vDUuJx7RaPR0kTHhlB/1cT8MgozDOhW+fOM+WU45qIR1ESt6flkVXQx1AQP1Yh1s+bR0HQ/2oCHjklHvz4saYJj7xkf3laHktKPPjxo6IJj2XJPsm0PJYV4sdQED/WNYmnlqD/tQQ88gr7lY96vhM1f3F6gv26Dc25XEnApaDMxfUeCbhsas5lJwGXojIXz/EEXLY04WIK/NhPwGVFwmUD5vy2P3zYQ6cDieWyrUm8FXGpJ+BSUucyHkgslwuac2kk4FJW5zIeSCyXixpwMSX7SIcJuKwq5Cue0+eeQ1ZTPoesCM4faD6WRDhHCfisKXx3EUaB63WaThA4v/I4xedxae+3meADu08mWvfQHLMSjl8m4FiRcLwAa6M+CkOng5pdx2v30HmOHwLbeejNTMDpfgJO6xJOm5Azt53IGUPi6I18/3t5TpysCfuyJNZ2BfuyeeD4bsJ5SoPZlz1SOE+hPwmpwTNFn42wPC+nvI/Bnrc8MfX6fshDj7nnUp/A73nEuff5/dC8z3Ni7m6E+qLvcUoacE/rPOe/AAAA//9qGb5tyDIAAA==";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/9yaPWzbRhTHSUqyJVmy5a9EbdNUBRLULWrTcYJA6KQideGiGYwmKJIuCi1dJBYSqZJUkXbK2LGjx4wdM3bsmLFjxnTLmCVAtvQufpTP57vTiVCogwg8nBhezHs//u/du4+qcXJVoNyFkv33uMwzJVvvOZRb2LLYanDfgPIBlI+hvILtEra79w/3m9/v3/+q7QRRM/KbrcFg59ZgcMdtI1LvKraPRfW+wb+horTefqvrfx10Qvz8c2yfjqt32w0jaOcB+EP8zGCrU36T++dLp/cmticXz95vbZ9yMSguo8s8e9tgHsffJX7vW7gODP61gm0RW4zwI/x7HZsA77nvSDgWsR1h+wmbPQwDu+e3nJ7d8f1OD9ldv4/s3wPH7vs/+3t2GLTe/bLJG+yh50YRCqPQRv0j1G6joEluUWDTDSD1+3wd1Sh9Ee71H2/n3r54nTP+e50zsbH6OrBOykH2pDxe4PN+xXAif1fGm623K+C9iq2A7U6E/buLRrph/foMm5Ui1xrTjldMOc7vWGd1gd8fgO8jv7cD9MtQ7H98peV/3jjbD9m4ZTDxbJxe3mlQhRuuZ0r0soGtROIPbv23rueGXdTm8fpizvRyCXyn/aYlM296IfFKlZuloJdD1+v8gMKB74WIx2t7TvVC+z3PejEn0EtGQS8klZHpZUcTvQys6eqF9lsnvbA6aTB5HXlOBPDGULtUeNG6Y68S5FE9l89nB5imrQ9DkA/SuqZT9EnzeVl/Nan3ppWvV6At8VQm1rFgmnPuO13TJF/fgPlQjMiinmeo//cUKj3LKY6jE+p9bJ6Ools9F3miPHVPk7j4wJpynh77rVmerltcjOfPLZgj8/SxoUFcrArm+6rrKknj4EtBOFThbiqMRyTf4+ny+oz75UumVO2XKnn9POW1rD6sCXhZCvogQzqP0w1N9PEoM119EH910kcVOI/Gf1Mctw2I3dOM2yJem9jK2Lxh/zvcfCdy8QxAoJNyirwmHc/yCbjI4uoS5F9O0DFE/eaqRuNZnA/Hqbvqur4sXlnUPdtv4wHs3uZ08/m4abx8nmr2ue9RgPE8re9xjG0N25/w/mPg8QQC918Qz57C+vrf0KH/gXX2Z4sn5b8A/kUB8tgiFbiJf2XgvwxcV2D9Hhz/YxXetyaPJwspz49D9+YN3ncqwneeZRyRxddpx5FTHtf3eDyWNOGRlbR/Uh6WEo9rN3k8SprwyAjav5yAR0ZhnAndOnecKacc10Q8ipK4PSmPrII+hoL4sQyxftY8CoL2VxPwyCnx4MePFU145CXry5PyWFDiwY8fFU14LErWSSblsagQP4aC+LGqSTy1BO2vJeCRV1ivfNjznaj5q9MTrNetac7lSgIuBWUurvdQwGVdcy5bCbgUlbl4jifgsqEJF1Pgx24CLksSLmsw5rf94VEPnXYklsumJvFWxKWegEtJncuoI7FcLmjOpZGAS1mdy6gjsVwuasDFlKwjHSTgsqyQr3hOn7sPWU15H7Ii2H+g+VgS4Rwm4LOicO4ijALX6zSdIHB+43GK9+PSXm8zwQd2nUw076E5ZiUcv0zAsSLheAHmRn0Uhk4HNbuO1+6h8xw/BLaz0JuZgNO9BJxWJZzWIWduO5EzgsTRGzn/e3lGnKwx67Ik1nYF67J54PhmzH5Kg1mXPVTYT6GPhNTgnaJjIyzPyymvY7D7LY9Nvc4PeegRd1/qE/g9izj3Ps8PzXo/J+buRqgvOo9T0oB7Wvs5/wcAAP//rWXXIMgyAAA=";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);