Dart: Futures -> Callbacks.

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

 // WARNING: DO NOT EDIT. This file was generated by a program.
 // See $MOJO_SDK/tools/bindings/mojom_bindings_generator.py.
 
 library media_transport_mojom;
 import 'dart:async';
 import 'package:mojo/bindings.dart' as bindings;
 import 'package:mojo/core.dart' as core;
 import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as service_describer;
 
 
 
 class MediaPacketRegion extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   int offset = 0;
   int length = 0;
 
   MediaPacketRegion() : super(kVersions.last.size);
 
+  MediaPacketRegion.init(
+    int this.offset, 
+    int this.length
+  ) : super(kVersions.last.size);
+
   static MediaPacketRegion deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static MediaPacketRegion decode(bindings.Decoder decoder0) {
@@ skipping 69 matching lines @@
     const bindings.StructDataHeader(40, 0)
   ];
   static const int kNoTimestamp = 9223372036854775807;
   int pts = 9223372036854775807;
   bool endOfStream = false;
   MediaPacketRegion payload = null;
   List<MediaPacketRegion> extraPayload = null;
 
   MediaPacket() : super(kVersions.last.size);
 
+  MediaPacket.init(
+    int this.pts, 
+    bool this.endOfStream, 
+    MediaPacketRegion this.payload, 
+    List<MediaPacketRegion> this.extraPayload
+  ) : super(kVersions.last.size);
+
   static MediaPacket deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static MediaPacket decode(bindings.Decoder decoder0) {
@@ skipping 110 matching lines @@
 
 
 class _MediaProducerConnectParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   MediaConsumerInterface consumer = null;
 
   _MediaProducerConnectParams() : super(kVersions.last.size);
 
+  _MediaProducerConnectParams.init(
+    MediaConsumerInterface this.consumer
+  ) : super(kVersions.last.size);
+
   static _MediaProducerConnectParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _MediaProducerConnectParams decode(bindings.Decoder decoder0) {
@@ skipping 50 matching lines @@
 }
 
 
 class MediaProducerConnectResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   MediaProducerConnectResponseParams() : super(kVersions.last.size);
 
+  MediaProducerConnectResponseParams.init(
+  ) : super(kVersions.last.size);
+
   static MediaProducerConnectResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static MediaProducerConnectResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 38 matching lines @@
 }
 
 
 class _MediaProducerDisconnectParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _MediaProducerDisconnectParams() : super(kVersions.last.size);
 
+  _MediaProducerDisconnectParams.init(
+  ) : super(kVersions.last.size);
+
   static _MediaProducerDisconnectParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _MediaProducerDisconnectParams decode(bindings.Decoder decoder0) {
@@ skipping 38 matching lines @@
 }
 
 
 class _MediaPullModeProducerGetBufferParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _MediaPullModeProducerGetBufferParams() : super(kVersions.last.size);
 
+  _MediaPullModeProducerGetBufferParams.init(
+  ) : super(kVersions.last.size);
+
   static _MediaPullModeProducerGetBufferParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _MediaPullModeProducerGetBufferParams decode(bindings.Decoder decoder0) {
@@ skipping 39 matching lines @@
 
 
 class MediaPullModeProducerGetBufferResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   core.MojoSharedBuffer buffer = null;
 
   MediaPullModeProducerGetBufferResponseParams() : super(kVersions.last.size);
 
+  MediaPullModeProducerGetBufferResponseParams.init(
+    core.MojoSharedBuffer this.buffer
+  ) : super(kVersions.last.size);
+
   static MediaPullModeProducerGetBufferResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static MediaPullModeProducerGetBufferResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 
 
 class _MediaPullModeProducerPullPacketParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   MediaPacket toRelease = null;
 
   _MediaPullModeProducerPullPacketParams() : super(kVersions.last.size);
 
+  _MediaPullModeProducerPullPacketParams.init(
+    MediaPacket this.toRelease
+  ) : super(kVersions.last.size);
+
   static _MediaPullModeProducerPullPacketParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _MediaPullModeProducerPullPacketParams decode(bindings.Decoder decoder0) {
@@ skipping 53 matching lines @@
 
 
 class MediaPullModeProducerPullPacketResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   MediaPacket packet = null;
 
   MediaPullModeProducerPullPacketResponseParams() : super(kVersions.last.size);
 
+  MediaPullModeProducerPullPacketResponseParams.init(
+    MediaPacket this.packet
+  ) : super(kVersions.last.size);
+
   static MediaPullModeProducerPullPacketResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static MediaPullModeProducerPullPacketResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 53 matching lines @@
 
 
 class _MediaPullModeProducerReleasePacketParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   MediaPacket toRelease = null;
 
   _MediaPullModeProducerReleasePacketParams() : super(kVersions.last.size);
 
+  _MediaPullModeProducerReleasePacketParams.init(
+    MediaPacket this.toRelease
+  ) : super(kVersions.last.size);
+
   static _MediaPullModeProducerReleasePacketParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _MediaPullModeProducerReleasePacketParams decode(bindings.Decoder decoder0) {
@@ skipping 53 matching lines @@
 
 
 class _MediaConsumerSetBufferParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   core.MojoSharedBuffer buffer = null;
 
   _MediaConsumerSetBufferParams() : super(kVersions.last.size);
 
+  _MediaConsumerSetBufferParams.init(
+    core.MojoSharedBuffer this.buffer
+  ) : super(kVersions.last.size);
+
   static _MediaConsumerSetBufferParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _MediaConsumerSetBufferParams decode(bindings.Decoder decoder0) {
@@ skipping 50 matching lines @@
 }
 
 
 class MediaConsumerSetBufferResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   MediaConsumerSetBufferResponseParams() : super(kVersions.last.size);
 
+  MediaConsumerSetBufferResponseParams.init(
+  ) : super(kVersions.last.size);
+
   static MediaConsumerSetBufferResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static MediaConsumerSetBufferResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 39 matching lines @@
 
 
 class _MediaConsumerSendPacketParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   MediaPacket packet = null;
 
   _MediaConsumerSendPacketParams() : super(kVersions.last.size);
 
+  _MediaConsumerSendPacketParams.init(
+    MediaPacket this.packet
+  ) : super(kVersions.last.size);
+
   static _MediaConsumerSendPacketParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _MediaConsumerSendPacketParams decode(bindings.Decoder decoder0) {
@@ skipping 53 matching lines @@
 
 
 class MediaConsumerSendPacketResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   MediaConsumerSendResult result = null;
 
   MediaConsumerSendPacketResponseParams() : super(kVersions.last.size);
 
+  MediaConsumerSendPacketResponseParams.init(
+    MediaConsumerSendResult this.result
+  ) : super(kVersions.last.size);
+
   static MediaConsumerSendPacketResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static MediaConsumerSendPacketResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 55 matching lines @@
 }
 
 
 class _MediaConsumerPrimeParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _MediaConsumerPrimeParams() : super(kVersions.last.size);
 
+  _MediaConsumerPrimeParams.init(
+  ) : super(kVersions.last.size);
+
   static _MediaConsumerPrimeParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _MediaConsumerPrimeParams decode(bindings.Decoder decoder0) {
@@ skipping 38 matching lines @@
 }
 
 
 class MediaConsumerPrimeResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   MediaConsumerPrimeResponseParams() : super(kVersions.last.size);
 
+  MediaConsumerPrimeResponseParams.init(
+  ) : super(kVersions.last.size);
+
   static MediaConsumerPrimeResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static MediaConsumerPrimeResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 38 matching lines @@
 }
 
 
 class _MediaConsumerFlushParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _MediaConsumerFlushParams() : super(kVersions.last.size);
 
+  _MediaConsumerFlushParams.init(
+  ) : super(kVersions.last.size);
+
   static _MediaConsumerFlushParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static _MediaConsumerFlushParams decode(bindings.Decoder decoder0) {
@@ skipping 38 matching lines @@
 }
 
 
 class MediaConsumerFlushResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   MediaConsumerFlushResponseParams() : super(kVersions.last.size);
 
+  MediaConsumerFlushResponseParams.init(
+  ) : super(kVersions.last.size);
+
   static MediaConsumerFlushResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
       decoder.excessHandles.forEach((h) => h.close());
     }
     return result;
   }
 
   static MediaConsumerFlushResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 34 matching lines @@
   Map toJson() {
     Map map = new Map();
     return map;
   }
 }
 
 const int _mediaProducerMethodConnectName = 0;
 const int _mediaProducerMethodDisconnectName = 1;
 
 class _MediaProducerServiceDescription 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 MediaProducer {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _MediaProducerServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static MediaProducerProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     MediaProducerProxy p = new MediaProducerProxy.unbound();
     String name = serviceName ?? MediaProducer.serviceName;
     if ((name == null) || name.isEmpty) {
       throw new core.MojoApiError(
           "If an interface has no ServiceName, then one must be provided.");
     }
     s.connectToService(url, p, name);
     return p;
   }
-  dynamic connect(MediaConsumerInterface consumer,[Function responseFactory = null]);
+  void connect(MediaConsumerInterface consumer,void callback());
   void disconnect();
 }
 
 abstract class MediaProducerInterface
     implements bindings.MojoInterface<MediaProducer>,
                MediaProducer {
   factory MediaProducerInterface([MediaProducer impl]) =>
       new MediaProducerStub.unbound(impl);
 
   factory MediaProducerInterface.fromEndpoint(
@@ skipping 30 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _mediaProducerMethodConnectName:
         var r = MediaProducerConnectResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback();
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   @override
   String toString() {
@@ skipping 24 matching lines @@
     return newMockedProxy;
   }
 
   static MediaProducerProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For MediaProducerProxy"));
     return new MediaProducerProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic connect(MediaConsumerInterface consumer,[Function responseFactory = null]) {
+  void connect(MediaConsumerInterface consumer,void callback()) {
     if (impl != null) {
-      return new Future(() => impl.connect(consumer,_MediaProducerStubControl._mediaProducerConnectResponseParamsFactory));
+      impl.connect(consumer,callback);
+      return;
     }
     var params = new _MediaProducerConnectParams();
     params.consumer = consumer;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _mediaProducerMethodConnectName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
   void disconnect() {
     if (impl != null) {
       impl.disconnect();
       return;
     }
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
@@ skipping 18 matching lines @@
       core.MojoHandle handle, [MediaProducer impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _MediaProducerStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => MediaProducer.serviceName;
 
 
-  static MediaProducerConnectResponseParams _mediaProducerConnectResponseParamsFactory() {
-    var result = new MediaProducerConnectResponseParams();
-    return result;
+  Function _mediaProducerConnectResponseParamsResponder(
+      int requestId) {
+  return () {
+      var result = new MediaProducerConnectResponseParams();
+      sendResponse(buildResponseWithId(
+          result,
+          _mediaProducerMethodConnectName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
 
-  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");
     }
     switch (message.header.type) {
       case _mediaProducerMethodConnectName:
         var params = _MediaProducerConnectParams.deserialize(
             message.payload);
-        var response = _impl.connect(params.consumer,_mediaProducerConnectResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _mediaProducerMethodConnectName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _mediaProducerMethodConnectName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.connect(params.consumer, _mediaProducerConnectResponseParamsResponder(message.header.requestId));
         break;
       case _mediaProducerMethodDisconnectName:
         _impl.disconnect();
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   MediaProducer get impl => _impl;
   set impl(MediaProducer d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 33 matching lines @@
       core.MojoHandle handle, [MediaProducer impl])
       : super(new _MediaProducerStubControl.fromHandle(handle, impl));
 
   static MediaProducerStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For MediaProducerStub"));
     return new MediaProducerStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic connect(MediaConsumerInterface consumer,[Function responseFactory = null]) {
-    return impl.connect(consumer,responseFactory);
+  void connect(MediaConsumerInterface consumer,void callback()) {
+    return impl.connect(consumer,callback);
   }
   void disconnect() {
     return impl.disconnect();
   }
 }
 
 const int _mediaPullModeProducerMethodGetBufferName = 0;
 const int _mediaPullModeProducerMethodPullPacketName = 1;
 const int _mediaPullModeProducerMethodReleasePacketName = 2;
 
 class _MediaPullModeProducerServiceDescription 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 MediaPullModeProducer {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _MediaPullModeProducerServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static MediaPullModeProducerProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     MediaPullModeProducerProxy p = new MediaPullModeProducerProxy.unbound();
     String name = serviceName ?? MediaPullModeProducer.serviceName;
     if ((name == null) || name.isEmpty) {
       throw new core.MojoApiError(
           "If an interface has no ServiceName, then one must be provided.");
     }
     s.connectToService(url, p, name);
     return p;
   }
-  dynamic getBuffer([Function responseFactory = null]);
-  dynamic pullPacket(MediaPacket toRelease,[Function responseFactory = null]);
+  void getBuffer(void callback(core.MojoSharedBuffer buffer));
+  void pullPacket(MediaPacket toRelease,void callback(MediaPacket packet));
   void releasePacket(MediaPacket toRelease);
 }
 
 abstract class MediaPullModeProducerInterface
     implements bindings.MojoInterface<MediaPullModeProducer>,
                MediaPullModeProducer {
   factory MediaPullModeProducerInterface([MediaPullModeProducer impl]) =>
       new MediaPullModeProducerStub.unbound(impl);
 
   factory MediaPullModeProducerInterface.fromEndpoint(
@@ skipping 30 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _mediaPullModeProducerMethodGetBufferName:
         var r = MediaPullModeProducerGetBufferResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback(r.buffer );
         break;
       case _mediaPullModeProducerMethodPullPacketName:
         var r = MediaPullModeProducerPullPacketResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback(r.packet );
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   @override
   String toString() {
@@ skipping 24 matching lines @@
     return newMockedProxy;
   }
 
   static MediaPullModeProducerProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For MediaPullModeProducerProxy"));
     return new MediaPullModeProducerProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic getBuffer([Function responseFactory = null]) {
+  void getBuffer(void callback(core.MojoSharedBuffer buffer)) {
     if (impl != null) {
-      return new Future(() => impl.getBuffer(_MediaPullModeProducerStubControl._mediaPullModeProducerGetBufferResponseParamsFactory));
+      impl.getBuffer(callback);
+      return;
     }
     var params = new _MediaPullModeProducerGetBufferParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _mediaPullModeProducerMethodGetBufferName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic pullPacket(MediaPacket toRelease,[Function responseFactory = null]) {
+  void pullPacket(MediaPacket toRelease,void callback(MediaPacket packet)) {
     if (impl != null) {
-      return new Future(() => impl.pullPacket(toRelease,_MediaPullModeProducerStubControl._mediaPullModeProducerPullPacketResponseParamsFactory));
+      impl.pullPacket(toRelease,callback);
+      return;
     }
     var params = new _MediaPullModeProducerPullPacketParams();
     params.toRelease = toRelease;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _mediaPullModeProducerMethodPullPacketName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
   void releasePacket(MediaPacket toRelease) {
     if (impl != null) {
       impl.releasePacket(toRelease);
       return;
     }
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
@@ skipping 19 matching lines @@
       core.MojoHandle handle, [MediaPullModeProducer impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _MediaPullModeProducerStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => MediaPullModeProducer.serviceName;
 
 
-  static MediaPullModeProducerGetBufferResponseParams _mediaPullModeProducerGetBufferResponseParamsFactory(core.MojoSharedBuffer buffer) {
-    var result = new MediaPullModeProducerGetBufferResponseParams();
-    result.buffer = buffer;
-    return result;
+  Function _mediaPullModeProducerGetBufferResponseParamsResponder(
+      int requestId) {
+  return (core.MojoSharedBuffer buffer) {
+      var result = new MediaPullModeProducerGetBufferResponseParams();
+      result.buffer = buffer;
+      sendResponse(buildResponseWithId(
+          result,
+          _mediaPullModeProducerMethodGetBufferName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  static MediaPullModeProducerPullPacketResponseParams _mediaPullModeProducerPullPacketResponseParamsFactory(MediaPacket packet) {
-    var result = new MediaPullModeProducerPullPacketResponseParams();
-    result.packet = packet;
-    return result;
+  Function _mediaPullModeProducerPullPacketResponseParamsResponder(
+      int requestId) {
+  return (MediaPacket packet) {
+      var result = new MediaPullModeProducerPullPacketResponseParams();
+      result.packet = packet;
+      sendResponse(buildResponseWithId(
+          result,
+          _mediaPullModeProducerMethodPullPacketName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
 
-  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");
     }
     switch (message.header.type) {
       case _mediaPullModeProducerMethodGetBufferName:
-        var response = _impl.getBuffer(_mediaPullModeProducerGetBufferResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _mediaPullModeProducerMethodGetBufferName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _mediaPullModeProducerMethodGetBufferName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.getBuffer(_mediaPullModeProducerGetBufferResponseParamsResponder(message.header.requestId));
         break;
       case _mediaPullModeProducerMethodPullPacketName:
         var params = _MediaPullModeProducerPullPacketParams.deserialize(
             message.payload);
-        var response = _impl.pullPacket(params.toRelease,_mediaPullModeProducerPullPacketResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _mediaPullModeProducerMethodPullPacketName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _mediaPullModeProducerMethodPullPacketName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.pullPacket(params.toRelease, _mediaPullModeProducerPullPacketResponseParamsResponder(message.header.requestId));
         break;
       case _mediaPullModeProducerMethodReleasePacketName:
         var params = _MediaPullModeProducerReleasePacketParams.deserialize(
             message.payload);
         _impl.releasePacket(params.toRelease);
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   MediaPullModeProducer get impl => _impl;
   set impl(MediaPullModeProducer d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 33 matching lines @@
       core.MojoHandle handle, [MediaPullModeProducer impl])
       : super(new _MediaPullModeProducerStubControl.fromHandle(handle, impl));
 
   static MediaPullModeProducerStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For MediaPullModeProducerStub"));
     return new MediaPullModeProducerStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic getBuffer([Function responseFactory = null]) {
-    return impl.getBuffer(responseFactory);
+  void getBuffer(void callback(core.MojoSharedBuffer buffer)) {
+    return impl.getBuffer(callback);
   }
-  dynamic pullPacket(MediaPacket toRelease,[Function responseFactory = null]) {
-    return impl.pullPacket(toRelease,responseFactory);
+  void pullPacket(MediaPacket toRelease,void callback(MediaPacket packet)) {
+    return impl.pullPacket(toRelease,callback);
   }
   void releasePacket(MediaPacket toRelease) {
     return impl.releasePacket(toRelease);
   }
 }
 
 const int _mediaConsumerMethodSetBufferName = 0;
 const int _mediaConsumerMethodSendPacketName = 1;
 const int _mediaConsumerMethodPrimeName = 2;
 const int _mediaConsumerMethodFlushName = 3;
@@ skipping 44 matching lines @@
         return 'MediaConsumerSendResult.flushed';
       default:
         return null;
     }
   }
 
   int toJson() => mojoEnumValue;
 }
 
 class _MediaConsumerServiceDescription 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 MediaConsumer {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _MediaConsumerServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static MediaConsumerProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     MediaConsumerProxy p = new MediaConsumerProxy.unbound();
     String name = serviceName ?? MediaConsumer.serviceName;
     if ((name == null) || name.isEmpty) {
       throw new core.MojoApiError(
           "If an interface has no ServiceName, then one must be provided.");
     }
     s.connectToService(url, p, name);
     return p;
   }
-  dynamic setBuffer(core.MojoSharedBuffer buffer,[Function responseFactory = null]);
-  dynamic sendPacket(MediaPacket packet,[Function responseFactory = null]);
-  dynamic prime([Function responseFactory = null]);
-  dynamic flush([Function responseFactory = null]);
+  void setBuffer(core.MojoSharedBuffer buffer,void callback());
+  void sendPacket(MediaPacket packet,void callback(MediaConsumerSendResult result));
+  void prime(void callback());
+  void flush(void callback());
   static const int kMaxBufferLen = 4611686018427387903;
 }
 
 abstract class MediaConsumerInterface
     implements bindings.MojoInterface<MediaConsumer>,
                MediaConsumer {
   factory MediaConsumerInterface([MediaConsumer impl]) =>
       new MediaConsumerStub.unbound(impl);
 
   factory MediaConsumerInterface.fromEndpoint(
@@ skipping 30 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _mediaConsumerMethodSetBufferName:
         var r = MediaConsumerSetBufferResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback();
         break;
       case _mediaConsumerMethodSendPacketName:
         var r = MediaConsumerSendPacketResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback(r.result );
         break;
       case _mediaConsumerMethodPrimeName:
         var r = MediaConsumerPrimeResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback();
         break;
       case _mediaConsumerMethodFlushName:
         var r = MediaConsumerFlushResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
-        Completer c = completerMap[message.header.requestId];
-        if (c == null) {
+        Function callback = callbackMap[message.header.requestId];
+        if (callback == null) {
           proxyError(
               "Message had unknown request Id: ${message.header.requestId}");
           return;
         }
-        completerMap.remove(message.header.requestId);
-        if (c.isCompleted) {
-          proxyError("Response completer already completed");
-          return;
-        }
-        c.complete(r);
+        callbackMap.remove(message.header.requestId);
+        callback();
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   @override
   String toString() {
@@ skipping 24 matching lines @@
     return newMockedProxy;
   }
 
   static MediaConsumerProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For MediaConsumerProxy"));
     return new MediaConsumerProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic setBuffer(core.MojoSharedBuffer buffer,[Function responseFactory = null]) {
+  void setBuffer(core.MojoSharedBuffer buffer,void callback()) {
     if (impl != null) {
-      return new Future(() => impl.setBuffer(buffer,_MediaConsumerStubControl._mediaConsumerSetBufferResponseParamsFactory));
+      impl.setBuffer(buffer,callback);
+      return;
     }
     var params = new _MediaConsumerSetBufferParams();
     params.buffer = buffer;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _mediaConsumerMethodSetBufferName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic sendPacket(MediaPacket packet,[Function responseFactory = null]) {
+  void sendPacket(MediaPacket packet,void callback(MediaConsumerSendResult result)) {
     if (impl != null) {
-      return new Future(() => impl.sendPacket(packet,_MediaConsumerStubControl._mediaConsumerSendPacketResponseParamsFactory));
+      impl.sendPacket(packet,callback);
+      return;
     }
     var params = new _MediaConsumerSendPacketParams();
     params.packet = packet;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _mediaConsumerMethodSendPacketName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic prime([Function responseFactory = null]) {
+  void prime(void callback()) {
     if (impl != null) {
-      return new Future(() => impl.prime(_MediaConsumerStubControl._mediaConsumerPrimeResponseParamsFactory));
+      impl.prime(callback);
+      return;
     }
     var params = new _MediaConsumerPrimeParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _mediaConsumerMethodPrimeName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic flush([Function responseFactory = null]) {
+  void flush(void callback()) {
     if (impl != null) {
-      return new Future(() => impl.flush(_MediaConsumerStubControl._mediaConsumerFlushResponseParamsFactory));
+      impl.flush(callback);
+      return;
     }
     var params = new _MediaConsumerFlushParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _mediaConsumerMethodFlushName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
 }
 
 class _MediaConsumerStubControl
     extends bindings.StubMessageHandler
     implements bindings.StubControl<MediaConsumer> {
   MediaConsumer _impl;
 
   _MediaConsumerStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [MediaConsumer impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _MediaConsumerStubControl.fromHandle(
       core.MojoHandle handle, [MediaConsumer impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _MediaConsumerStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => MediaConsumer.serviceName;
 
 
-  static MediaConsumerSetBufferResponseParams _mediaConsumerSetBufferResponseParamsFactory() {
-    var result = new MediaConsumerSetBufferResponseParams();
-    return result;
+  Function _mediaConsumerSetBufferResponseParamsResponder(
+      int requestId) {
+  return () {
+      var result = new MediaConsumerSetBufferResponseParams();
+      sendResponse(buildResponseWithId(
+          result,
+          _mediaConsumerMethodSetBufferName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  static MediaConsumerSendPacketResponseParams _mediaConsumerSendPacketResponseParamsFactory(MediaConsumerSendResult result) {
-    var result = new MediaConsumerSendPacketResponseParams();
-    result.result = result;
-    return result;
+  Function _mediaConsumerSendPacketResponseParamsResponder(
+      int requestId) {
+  return (MediaConsumerSendResult result) {
+      var result = new MediaConsumerSendPacketResponseParams();
+      result.result = result;
+      sendResponse(buildResponseWithId(
+          result,
+          _mediaConsumerMethodSendPacketName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  static MediaConsumerPrimeResponseParams _mediaConsumerPrimeResponseParamsFactory() {
-    var result = new MediaConsumerPrimeResponseParams();
-    return result;
+  Function _mediaConsumerPrimeResponseParamsResponder(
+      int requestId) {
+  return () {
+      var result = new MediaConsumerPrimeResponseParams();
+      sendResponse(buildResponseWithId(
+          result,
+          _mediaConsumerMethodPrimeName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  static MediaConsumerFlushResponseParams _mediaConsumerFlushResponseParamsFactory() {
-    var result = new MediaConsumerFlushResponseParams();
-    return result;
+  Function _mediaConsumerFlushResponseParamsResponder(
+      int requestId) {
+  return () {
+      var result = new MediaConsumerFlushResponseParams();
+      sendResponse(buildResponseWithId(
+          result,
+          _mediaConsumerMethodFlushName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
 
-  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");
     }
     switch (message.header.type) {
       case _mediaConsumerMethodSetBufferName:
         var params = _MediaConsumerSetBufferParams.deserialize(
             message.payload);
-        var response = _impl.setBuffer(params.buffer,_mediaConsumerSetBufferResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _mediaConsumerMethodSetBufferName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _mediaConsumerMethodSetBufferName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.setBuffer(params.buffer, _mediaConsumerSetBufferResponseParamsResponder(message.header.requestId));
         break;
       case _mediaConsumerMethodSendPacketName:
         var params = _MediaConsumerSendPacketParams.deserialize(
             message.payload);
-        var response = _impl.sendPacket(params.packet,_mediaConsumerSendPacketResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _mediaConsumerMethodSendPacketName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _mediaConsumerMethodSendPacketName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.sendPacket(params.packet, _mediaConsumerSendPacketResponseParamsResponder(message.header.requestId));
         break;
       case _mediaConsumerMethodPrimeName:
-        var response = _impl.prime(_mediaConsumerPrimeResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _mediaConsumerMethodPrimeName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _mediaConsumerMethodPrimeName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.prime(_mediaConsumerPrimeResponseParamsResponder(message.header.requestId));
         break;
       case _mediaConsumerMethodFlushName:
-        var response = _impl.flush(_mediaConsumerFlushResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _mediaConsumerMethodFlushName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _mediaConsumerMethodFlushName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.flush(_mediaConsumerFlushResponseParamsResponder(message.header.requestId));
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   MediaConsumer get impl => _impl;
   set impl(MediaConsumer d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 33 matching lines @@
       core.MojoHandle handle, [MediaConsumer impl])
       : super(new _MediaConsumerStubControl.fromHandle(handle, impl));
 
   static MediaConsumerStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For MediaConsumerStub"));
     return new MediaConsumerStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic setBuffer(core.MojoSharedBuffer buffer,[Function responseFactory = null]) {
-    return impl.setBuffer(buffer,responseFactory);
+  void setBuffer(core.MojoSharedBuffer buffer,void callback()) {
+    return impl.setBuffer(buffer,callback);
   }
-  dynamic sendPacket(MediaPacket packet,[Function responseFactory = null]) {
-    return impl.sendPacket(packet,responseFactory);
+  void sendPacket(MediaPacket packet,void callback(MediaConsumerSendResult result)) {
+    return impl.sendPacket(packet,callback);
   }
-  dynamic prime([Function responseFactory = null]) {
-    return impl.prime(responseFactory);
+  void prime(void callback()) {
+    return impl.prime(callback);
   }
-  dynamic flush([Function responseFactory = null]) {
-    return impl.flush(responseFactory);
+  void flush(void callback()) {
+    return impl.flush(callback);
   }
 }