Dart: Futures -> Callbacks.

mojo/dart/packages/mojo/lib/mojo/service_provider.mojom.dart

Index: mojo/dart/packages/mojo/lib/mojo/service_provider.mojom.dart
diff --git a/mojo/dart/packages/mojo/lib/mojo/service_provider.mojom.dart b/mojo/dart/packages/mojo/lib/mojo/service_provider.mojom.dart
index ba493f05bc4b7bc672a381d87acd1c603855bb21..54a64360bc197414ada9dd4b037c08b1ef59b7b4 100644
--- a/mojo/dart/packages/mojo/lib/mojo/service_provider.mojom.dart
+++ b/mojo/dart/packages/mojo/lib/mojo/service_provider.mojom.dart
@@ -18,6 +18,11 @@ class _ServiceProviderConnectToServiceParams extends bindings.Struct {
 
   _ServiceProviderConnectToServiceParams() : super(kVersions.last.size);
 
+  _ServiceProviderConnectToServiceParams.init(
+    String this.interfaceName, 
+    core.MojoMessagePipeEndpoint this.pipe
+  ) : super(kVersions.last.size);
+
   static _ServiceProviderConnectToServiceParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -95,14 +100,17 @@ class _ServiceProviderConnectToServiceParams extends bindings.Struct {
 const int _serviceProviderMethodConnectToServiceName = 0;
 
 class _ServiceProviderServiceDescription 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 ServiceProvider {
@@ -253,11 +261,11 @@ class _ServiceProviderStubControl
 
 
 
-  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");
@@ -272,7 +280,6 @@ class _ServiceProviderStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   ServiceProvider get impl => _impl;