Dart: Futures -> Callbacks.

mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart

Index: mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart
diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart
index 279f5f0b43e1095d07fac408f6ef635f99d1c73c..a5a6d6f9f4f0efa35ede49fc045f093acb1a2a80 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart
@@ -208,6 +208,11 @@ class Point extends bindings.Struct {
 
   Point() : super(kVersions.last.size);
 
+  Point.init(
+    int this.x, 
+    int this.y
+  ) : super(kVersions.last.size);
+
   static Point deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -292,6 +297,9 @@ class _ImportedInterfaceDoSomethingParams extends bindings.Struct {
 
   _ImportedInterfaceDoSomethingParams() : super(kVersions.last.size);
 
+  _ImportedInterfaceDoSomethingParams.init(
+  ) : super(kVersions.last.size);
+
   static _ImportedInterfaceDoSomethingParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -345,14 +353,17 @@ class _ImportedInterfaceDoSomethingParams extends bindings.Struct {
 const int _importedInterfaceMethodDoSomethingName = 0;
 
 class _ImportedInterfaceServiceDescription 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 ImportedInterface {
@@ -501,11 +512,11 @@ class _ImportedInterfaceStubControl
 
 
 
-  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");
@@ -518,7 +529,6 @@ class _ImportedInterfaceStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   ImportedInterface get impl => _impl;
@@ -590,7 +600,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/8yYX3PSQBDAL9AqtbTi2D/0j5pq1aoj8bHjUzuVEcaOwwAP8OAUSiOJAwSTMKN+Aj9GP4ofxY/QR9/0QvYk2dxBojRwMztHckty+7vdvc1lidsy0L+CHt9nfQr1WI9Io+csUjmA2wXo+9B/h/4S+idU7lOp1kv5s3f5+mu92zdMW73IHfcMW1PNitbsq4S8oDqPuHpF+FHs2ar5sdlSh899QGWTq18y9J49Ztx94TM6tscdr6u2f2rDVgO7M8hu5zpJ5efC6NpBpaX8/H4s+68v74znfET8ja0fu/8bWonw2xqVNBVsyj0q61QEyxCYz12w2xn7QEUZWKbSMVrNjtI2jHZHVTSjqyrfzKbSNT4ZimW23B/9wXlHbyk6WzVLOdd7F3qvbSm2atmWYjW7/Y565k4k5/ynS58vA082jwLwaCTcnvmdjP0Y9G6RaPxqAn7O8ixRKedPqsfv357m4f5T8D0uv9xIG3N01iMRI0fml4wH5obb8gRuhyH9bpXKDSonxfKJA22f/t4V8mJaQb9bj5nXJD7pKfHJQI6tlotDR2H5kc+HaQX5bMwJn6zkvxbxKSA+DQGfLYg9ftYn5CGVbS8vgSLmtQ+xEBcv/P6sx48k5A+SZ9/FnK8EnESciYcz7z7x5HUn5t8YFWq3rVGDuNwex+xnMuJ1hfowdjvtUGD3DtjusfulqX4e0Cnx92NocdmfEvhFFs0nhfyEjf9ifpSMlq+OBLxWYP93qyo376x64w8GMDdnj7wZc7wlvPGG6qhDNL9FEq6FjbMDwf+XYB2/COpqGdYyLk5ReSz8Aw8pBI+vAh57MfMYF2cJTv7OhMxHUeOL1d+B+IIB/P7lmOvyA/AFGdXlNajLteT4+jwl+T5v/vv7RlSfy7BWfn6jwhxzTM+oLpdC1uWJiH5WCFmXB74DUUGOOa3MWT2enBIXXI+zcwPE5W8hjrmszphLhvmINF0uaYj30+NK1Vs3IS5sOMDl9ozrRhnFj2idRedD13Uuswls8ClTIG8hBTyfrRmfy5SAhzbhXIbVYWsR834jYt5/Dt+GIn459AfMc3tG+8BayH1g/ZrOZwLnWZgbKGJeO3O2H2xE5FMLuR+wc2Ihn9ERDdevdmPm9CcAAP//jmet5PgXAAA=";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/8yYzW7TQBCA10kLKU1LEP1JfwAXChQQWcSp4tSqRCSiQlGbQ3qhTVO3NkriYDsS8AQ8Rh+FR+EReuQG63iW2OPdxIbUyUqjjb3jeOfbmdnx5onXctC/gh7f530G9ViPKP3/mWayBbdL0Heg/w79JfRPmNxnUj2qFI/fF4/eGK2OaTnaWWG3bTq6Zh3q9Y5GyAum80ioV4Yf5bajWef1htb73wdMloX6FdNoOwPGvRc+Y2MbwvEjzQlOrddqYHcO2e1ep5n8nOpfu6j0TJDfj9ng9eWdwZx3SLDx9eP3f0OrEHFbYJJlgk25x2SRiWQZQvO5C3afM/nIhHZtizbNRr1JL0zzoqlR3Wxp9JtVpy3zk/ma2laj94t2uqdNo0ENvmw2PTXaZ0b7wqaOZjs2teutTlM79mZScJ9pEaICTz6PEvA4SXk99zsV+zHo3SLx+NUk/NzlmWFyUNyr7n54t1+E+0/B94T8Cn1tzNFdj1SCHLlfch6YG26zQ7htR/S7eSY3mOyVD/ZcaJvs97qUF9cK+91iwryG8cmOiE8Ocmz1oNxzFJ4fxXy4VpjP0oTwySvBaxmfEuJzIuGzArEnzvqEPGSy6uclUcS8NiEWkuKF35/3+ZGC/EHx7buY85WEk4wz8XEW3Se+vO7G/FvzkNnt6MweIbfHCfuZinhdoT6K3W7blti9Brb77H5paZ+7bEbi/RhaUvZnJH6RR/PJID/h47+4H6Xj5asdCa852P+9qsrLO/P++IMBzM3dI28mHG8pf7yhOmobzW+aRGtR42xL8vwMrOMXSV2twlomxSkuj6l/4KFE4PFVwmMjYR6D4iwlyN+5iPkobnzx+jsUXzCA3z+bcF2+Bb6gorq8BnW5nh5cn2eUwOfNf3/fyOpzFdYqyK9fmGOO2THV5UrEujwV089KEevy0HcgKsgxp7kJq8fTI+KC63F+boC4/C3EMZf5MXPJcR9RRsslC/G+v3tY9ddNiAsfDnG5Pea6UUXxI1tn2fnQdZ3LLAMbfMoUyltIAc9nZcznMhXgoQ85l+F12ELMvH8SM+8/h29DGb8CegDzXB3TPrAQcR9YvKbzmdB5FuYGipjX2oTtB0sx+dQi7gf8nFjKp39EI/Sr9YQ5/QkAAP//SWnGfvgXAAA=";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);