Dart: Futures -> Callbacks.

mojo/dart/packages/mojo_services/lib/mojo/service_registry.mojom.dart

Index: mojo/dart/packages/mojo_services/lib/mojo/service_registry.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/service_registry.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/service_registry.mojom.dart
index cc85c334e5bb32d90bbc7c742147996d02aa33e9..a4eeeee3884ee57b91d2109ff9ff3a0f37d9698a 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/service_registry.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/service_registry.mojom.dart
@@ -20,6 +20,11 @@ class _ServiceRegistryAddServicesParams extends bindings.Struct {
 
   _ServiceRegistryAddServicesParams() : super(kVersions.last.size);
 
+  _ServiceRegistryAddServicesParams.init(
+    List<String> this.interfaceNames, 
+    service_provider_mojom.ServiceProviderInterface this.serviceProvider
+  ) : super(kVersions.last.size);
+
   static _ServiceRegistryAddServicesParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -112,14 +117,17 @@ class _ServiceRegistryAddServicesParams extends bindings.Struct {
 const int _serviceRegistryMethodAddServicesName = 0;
 
 class _ServiceRegistryServiceDescription 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 ServiceRegistry {
@@ -270,11 +278,11 @@ class _ServiceRegistryStubControl
 
 
 
-  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");
@@ -289,7 +297,6 @@ class _ServiceRegistryStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   ServiceRegistry get impl => _impl;