Dart: Futures -> Callbacks.

mojo/dart/packages/mojo_services/lib/mojo/media/media_sink.mojom.dart

Index: mojo/dart/packages/mojo_services/lib/mojo/media/media_sink.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/media/media_sink.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/media/media_sink.mojom.dart
index 291fa4f4bad537b4ae111bcafc213fbcdb7c9d2b..5810c0b2fba6121dd558a6ccc8231f4767cba63c 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/media/media_sink.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/media/media_sink.mojom.dart
@@ -20,6 +20,10 @@ class _MediaSinkGetConsumerParams extends bindings.Struct {
 
   _MediaSinkGetConsumerParams() : super(kVersions.last.size);
 
+  _MediaSinkGetConsumerParams.init(
+    media_transport_mojom.MediaConsumerInterfaceRequest this.consumer
+  ) : super(kVersions.last.size);
+
   static _MediaSinkGetConsumerParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -91,6 +95,10 @@ class _MediaSinkGetTimelineControlSiteParams extends bindings.Struct {
 
   _MediaSinkGetTimelineControlSiteParams() : super(kVersions.last.size);
 
+  _MediaSinkGetTimelineControlSiteParams.init(
+    timeline_controller_mojom.MediaTimelineControlSiteInterfaceRequest this.timelineControlSite
+  ) : super(kVersions.last.size);
+
   static _MediaSinkGetTimelineControlSiteParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -157,14 +165,17 @@ const int _mediaSinkMethodGetConsumerName = 0;
 const int _mediaSinkMethodGetTimelineControlSiteName = 1;
 
 class _MediaSinkServiceDescription 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 MediaSink {
@@ -312,11 +323,11 @@ class _MediaSinkStubControl
 
 
 
-  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");
@@ -336,7 +347,6 @@ class _MediaSinkStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   MediaSink get impl => _impl;