Dart: Futures -> Callbacks.

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

 // WARNING: DO NOT EDIT. This file was generated by a program.
 // See $MOJO_SDK/tools/bindings/mojom_bindings_generator.py.
 
 library flog_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 FlogDescription extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(48, 0)
   ];
   String label = null;
   int logId = 0;
   int entryCount = 0;
   int startTimeUs = 0;
   int stopTimeUs = 0;
   bool open = false;
 
   FlogDescription() : super(kVersions.last.size);
 
+  FlogDescription.init(
+    String this.label, 
+    int this.logId, 
+    int this.entryCount, 
+    int this.startTimeUs, 
+    int this.stopTimeUs, 
+    bool this.open
+  ) : super(kVersions.last.size);
+
   static FlogDescription 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 FlogDescription decode(bindings.Decoder decoder0) {
@@ skipping 120 matching lines @@
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(40, 0)
   ];
   int timeUs = 0;
   int logId = 0;
   int channelId = 0;
   FlogEntryDetails details = null;
 
   FlogEntry() : super(kVersions.last.size);
 
+  FlogEntry.init(
+    int this.timeUs, 
+    int this.logId, 
+    int this.channelId, 
+    FlogEntryDetails this.details
+  ) : super(kVersions.last.size);
+
   static FlogEntry 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 FlogEntry decode(bindings.Decoder decoder0) {
@@ skipping 91 matching lines @@
 
 
 class FlogChannelCreationEntryDetails extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   String typeName = null;
 
   FlogChannelCreationEntryDetails() : super(kVersions.last.size);
 
+  FlogChannelCreationEntryDetails.init(
+    String this.typeName
+  ) : super(kVersions.last.size);
+
   static FlogChannelCreationEntryDetails 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 FlogChannelCreationEntryDetails decode(bindings.Decoder decoder0) {
@@ skipping 52 matching lines @@
 
 
 class FlogChannelMessageEntryDetails extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   List<int> data = null;
 
   FlogChannelMessageEntryDetails() : super(kVersions.last.size);
 
+  FlogChannelMessageEntryDetails.init(
+    List<int> this.data
+  ) : super(kVersions.last.size);
+
   static FlogChannelMessageEntryDetails 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 FlogChannelMessageEntryDetails decode(bindings.Decoder decoder0) {
@@ skipping 53 matching lines @@
 
 class _FlogServiceCreateLoggerParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   FlogLoggerInterfaceRequest logger = null;
   String label = null;
 
   _FlogServiceCreateLoggerParams() : super(kVersions.last.size);
 
+  _FlogServiceCreateLoggerParams.init(
+    FlogLoggerInterfaceRequest this.logger, 
+    String this.label
+  ) : super(kVersions.last.size);
+
   static _FlogServiceCreateLoggerParams 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 _FlogServiceCreateLoggerParams decode(bindings.Decoder decoder0) {
@@ skipping 62 matching lines @@
 }
 
 
 class _FlogServiceGetLogDescriptionsParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _FlogServiceGetLogDescriptionsParams() : super(kVersions.last.size);
 
+  _FlogServiceGetLogDescriptionsParams.init(
+  ) : super(kVersions.last.size);
+
   static _FlogServiceGetLogDescriptionsParams 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 _FlogServiceGetLogDescriptionsParams decode(bindings.Decoder decoder0) {
@@ skipping 39 matching lines @@
 
 
 class FlogServiceGetLogDescriptionsResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   List<FlogDescription> descriptions = null;
 
   FlogServiceGetLogDescriptionsResponseParams() : super(kVersions.last.size);
 
+  FlogServiceGetLogDescriptionsResponseParams.init(
+    List<FlogDescription> this.descriptions
+  ) : super(kVersions.last.size);
+
   static FlogServiceGetLogDescriptionsResponseParams 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 FlogServiceGetLogDescriptionsResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 69 matching lines @@
 
 class _FlogServiceCreateReaderParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   FlogReaderInterfaceRequest reader = null;
   int logId = 0;
 
   _FlogServiceCreateReaderParams() : super(kVersions.last.size);
 
+  _FlogServiceCreateReaderParams.init(
+    FlogReaderInterfaceRequest this.reader, 
+    int this.logId
+  ) : super(kVersions.last.size);
+
   static _FlogServiceCreateReaderParams 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 _FlogServiceCreateReaderParams decode(bindings.Decoder decoder0) {
@@ skipping 65 matching lines @@
 class _FlogLoggerLogChannelCreationParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(32, 0)
   ];
   int timeUs = 0;
   int channelId = 0;
   String typeName = null;
 
   _FlogLoggerLogChannelCreationParams() : super(kVersions.last.size);
 
+  _FlogLoggerLogChannelCreationParams.init(
+    int this.timeUs, 
+    int this.channelId, 
+    String this.typeName
+  ) : super(kVersions.last.size);
+
   static _FlogLoggerLogChannelCreationParams 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 _FlogLoggerLogChannelCreationParams decode(bindings.Decoder decoder0) {
@@ skipping 80 matching lines @@
 class _FlogLoggerLogChannelMessageParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(32, 0)
   ];
   int timeUs = 0;
   int channelId = 0;
   List<int> data = null;
 
   _FlogLoggerLogChannelMessageParams() : super(kVersions.last.size);
 
+  _FlogLoggerLogChannelMessageParams.init(
+    int this.timeUs, 
+    int this.channelId, 
+    List<int> this.data
+  ) : super(kVersions.last.size);
+
   static _FlogLoggerLogChannelMessageParams 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 _FlogLoggerLogChannelMessageParams decode(bindings.Decoder decoder0) {
@@ skipping 79 matching lines @@
 
 class _FlogLoggerLogChannelDeletionParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   int timeUs = 0;
   int channelId = 0;
 
   _FlogLoggerLogChannelDeletionParams() : super(kVersions.last.size);
 
+  _FlogLoggerLogChannelDeletionParams.init(
+    int this.timeUs, 
+    int this.channelId
+  ) : super(kVersions.last.size);
+
   static _FlogLoggerLogChannelDeletionParams 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 _FlogLoggerLogChannelDeletionParams decode(bindings.Decoder decoder0) {
@@ skipping 66 matching lines @@
 
 class _FlogReaderGetEntriesParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   int startIndex = 0;
   int maxCount = 0;
 
   _FlogReaderGetEntriesParams() : super(kVersions.last.size);
 
+  _FlogReaderGetEntriesParams.init(
+    int this.startIndex, 
+    int this.maxCount
+  ) : super(kVersions.last.size);
+
   static _FlogReaderGetEntriesParams 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 _FlogReaderGetEntriesParams decode(bindings.Decoder decoder0) {
@@ skipping 67 matching lines @@
 class FlogReaderGetEntriesResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   List<FlogEntry> entries = null;
   int entryCount = 0;
   bool open = false;
 
   FlogReaderGetEntriesResponseParams() : super(kVersions.last.size);
 
+  FlogReaderGetEntriesResponseParams.init(
+    List<FlogEntry> this.entries, 
+    int this.entryCount, 
+    bool this.open
+  ) : super(kVersions.last.size);
+
   static FlogReaderGetEntriesResponseParams 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 FlogReaderGetEntriesResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 195 matching lines @@
     }
     result += ": $_data)";
     return result;
   }
 }
 const int _flogServiceMethodCreateLoggerName = 0;
 const int _flogServiceMethodGetLogDescriptionsName = 1;
 const int _flogServiceMethodCreateReaderName = 2;
 
 class _FlogServiceServiceDescription 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 FlogService {
   static const String serviceName = "mojo::flog::FlogService";
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _FlogServiceServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static FlogServiceProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     FlogServiceProxy p = new FlogServiceProxy.unbound();
     String name = serviceName ?? FlogService.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;
   }
   void createLogger(FlogLoggerInterfaceRequest logger, String label);
-  dynamic getLogDescriptions([Function responseFactory = null]);
+  void getLogDescriptions(void callback(List<FlogDescription> descriptions));
   void createReader(FlogReaderInterfaceRequest reader, int logId);
 }
 
 abstract class FlogServiceInterface
     implements bindings.MojoInterface<FlogService>,
                FlogService {
   factory FlogServiceInterface([FlogService impl]) =>
       new FlogServiceStub.unbound(impl);
 
   factory FlogServiceInterface.fromEndpoint(
@@ skipping 30 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _flogServiceMethodGetLogDescriptionsName:
         var r = FlogServiceGetLogDescriptionsResponseParams.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.descriptions );
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   @override
   String toString() {
@@ skipping 39 matching lines @@
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _FlogServiceCreateLoggerParams();
     params.logger = logger;
     params.label = label;
     ctrl.sendMessage(params,
         _flogServiceMethodCreateLoggerName);
   }
-  dynamic getLogDescriptions([Function responseFactory = null]) {
+  void getLogDescriptions(void callback(List<FlogDescription> descriptions)) {
     if (impl != null) {
-      return new Future(() => impl.getLogDescriptions(_FlogServiceStubControl._flogServiceGetLogDescriptionsResponseParamsFactory));
+      impl.getLogDescriptions(callback);
+      return;
     }
     var params = new _FlogServiceGetLogDescriptionsParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _flogServiceMethodGetLogDescriptionsName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
   void createReader(FlogReaderInterfaceRequest reader, int logId) {
     if (impl != null) {
       impl.createReader(reader, logId);
       return;
     }
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
@@ skipping 20 matching lines @@
       core.MojoHandle handle, [FlogService impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _FlogServiceStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => FlogService.serviceName;
 
 
-  static FlogServiceGetLogDescriptionsResponseParams _flogServiceGetLogDescriptionsResponseParamsFactory(List<FlogDescription> descriptions) {
-    var result = new FlogServiceGetLogDescriptionsResponseParams();
-    result.descriptions = descriptions;
-    return result;
+  Function _flogServiceGetLogDescriptionsResponseParamsResponder(
+      int requestId) {
+  return (List<FlogDescription> descriptions) {
+      var result = new FlogServiceGetLogDescriptionsResponseParams();
+      result.descriptions = descriptions;
+      sendResponse(buildResponseWithId(
+          result,
+          _flogServiceMethodGetLogDescriptionsName,
+          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 _flogServiceMethodCreateLoggerName:
         var params = _FlogServiceCreateLoggerParams.deserialize(
             message.payload);
         _impl.createLogger(params.logger, params.label);
         break;
       case _flogServiceMethodGetLogDescriptionsName:
-        var response = _impl.getLogDescriptions(_flogServiceGetLogDescriptionsResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _flogServiceMethodGetLogDescriptionsName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _flogServiceMethodGetLogDescriptionsName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.getLogDescriptions(_flogServiceGetLogDescriptionsResponseParamsResponder(message.header.requestId));
         break;
       case _flogServiceMethodCreateReaderName:
         var params = _FlogServiceCreateReaderParams.deserialize(
             message.payload);
         _impl.createReader(params.reader, params.logId);
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   FlogService get impl => _impl;
   set impl(FlogService d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 36 matching lines @@
   static FlogServiceStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For FlogServiceStub"));
     return new FlogServiceStub.fromEndpoint(endpoint);
   }
 
 
   void createLogger(FlogLoggerInterfaceRequest logger, String label) {
     return impl.createLogger(logger, label);
   }
-  dynamic getLogDescriptions([Function responseFactory = null]) {
-    return impl.getLogDescriptions(responseFactory);
+  void getLogDescriptions(void callback(List<FlogDescription> descriptions)) {
+    return impl.getLogDescriptions(callback);
   }
   void createReader(FlogReaderInterfaceRequest reader, int logId) {
     return impl.createReader(reader, logId);
   }
 }
 
 const int _flogLoggerMethodLogChannelCreationName = 0;
 const int _flogLoggerMethodLogChannelMessageName = 1;
 const int _flogLoggerMethodLogChannelDeletionName = 2;
 
 class _FlogLoggerServiceDescription 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 FlogLogger {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _FlogLoggerServiceDescription();
     }
@@ skipping 164 matching lines @@
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _FlogLoggerStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => FlogLogger.serviceName;
 
 
 
-  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 _flogLoggerMethodLogChannelCreationName:
         var params = _FlogLoggerLogChannelCreationParams.deserialize(
             message.payload);
         _impl.logChannelCreation(params.timeUs, params.channelId, params.typeName);
         break;
       case _flogLoggerMethodLogChannelMessageName:
         var params = _FlogLoggerLogChannelMessageParams.deserialize(
             message.payload);
         _impl.logChannelMessage(params.timeUs, params.channelId, params.data);
         break;
       case _flogLoggerMethodLogChannelDeletionName:
         var params = _FlogLoggerLogChannelDeletionParams.deserialize(
             message.payload);
         _impl.logChannelDeletion(params.timeUs, params.channelId);
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   FlogLogger get impl => _impl;
   set impl(FlogLogger d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 47 matching lines @@
     return impl.logChannelMessage(timeUs, channelId, data);
   }
   void logChannelDeletion(int timeUs, int channelId) {
     return impl.logChannelDeletion(timeUs, channelId);
   }
 }
 
 const int _flogReaderMethodGetEntriesName = 0;
 
 class _FlogReaderServiceDescription 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 FlogReader {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _FlogReaderServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static FlogReaderProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     FlogReaderProxy p = new FlogReaderProxy.unbound();
     String name = serviceName ?? FlogReader.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 getEntries(int startIndex,int maxCount,[Function responseFactory = null]);
+  void getEntries(int startIndex,int maxCount,void callback(List<FlogEntry> entries, int entryCount, bool open));
 }
 
 abstract class FlogReaderInterface
     implements bindings.MojoInterface<FlogReader>,
                FlogReader {
   factory FlogReaderInterface([FlogReader impl]) =>
       new FlogReaderStub.unbound(impl);
 
   factory FlogReaderInterface.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint,
@@ skipping 29 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _flogReaderMethodGetEntriesName:
         var r = FlogReaderGetEntriesResponseParams.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.entries , r.entryCount , r.open );
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   @override
   String toString() {
@@ skipping 24 matching lines @@
     return newMockedProxy;
   }
 
   static FlogReaderProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For FlogReaderProxy"));
     return new FlogReaderProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic getEntries(int startIndex,int maxCount,[Function responseFactory = null]) {
+  void getEntries(int startIndex,int maxCount,void callback(List<FlogEntry> entries, int entryCount, bool open)) {
     if (impl != null) {
-      return new Future(() => impl.getEntries(startIndex,maxCount,_FlogReaderStubControl._flogReaderGetEntriesResponseParamsFactory));
+      impl.getEntries(startIndex,maxCount,callback);
+      return;
     }
     var params = new _FlogReaderGetEntriesParams();
     params.startIndex = startIndex;
     params.maxCount = maxCount;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _flogReaderMethodGetEntriesName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
 }
 
 class _FlogReaderStubControl
     extends bindings.StubMessageHandler
     implements bindings.StubControl<FlogReader> {
   FlogReader _impl;
 
   _FlogReaderStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [FlogReader impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _FlogReaderStubControl.fromHandle(
       core.MojoHandle handle, [FlogReader impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _FlogReaderStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => FlogReader.serviceName;
 
 
-  static FlogReaderGetEntriesResponseParams _flogReaderGetEntriesResponseParamsFactory(List<FlogEntry> entries, int entryCount, bool open) {
-    var result = new FlogReaderGetEntriesResponseParams();
-    result.entries = entries;
-    result.entryCount = entryCount;
-    result.open = open;
-    return result;
+  Function _flogReaderGetEntriesResponseParamsResponder(
+      int requestId) {
+  return (List<FlogEntry> entries, int entryCount, bool open) {
+      var result = new FlogReaderGetEntriesResponseParams();
+      result.entries = entries;
+      result.entryCount = entryCount;
+      result.open = open;
+      sendResponse(buildResponseWithId(
+          result,
+          _flogReaderMethodGetEntriesName,
+          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 _flogReaderMethodGetEntriesName:
         var params = _FlogReaderGetEntriesParams.deserialize(
             message.payload);
-        var response = _impl.getEntries(params.startIndex,params.maxCount,_flogReaderGetEntriesResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _flogReaderMethodGetEntriesName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _flogReaderMethodGetEntriesName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.getEntries(params.startIndex, params.maxCount, _flogReaderGetEntriesResponseParamsResponder(message.header.requestId));
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   FlogReader get impl => _impl;
   set impl(FlogReader 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, [FlogReader impl])
       : super(new _FlogReaderStubControl.fromHandle(handle, impl));
 
   static FlogReaderStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For FlogReaderStub"));
     return new FlogReaderStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic getEntries(int startIndex,int maxCount,[Function responseFactory = null]) {
-    return impl.getEntries(startIndex,maxCount,responseFactory);
+  void getEntries(int startIndex,int maxCount,void callback(List<FlogEntry> entries, int entryCount, bool open)) {
+    return impl.getEntries(startIndex,maxCount,callback);
   }
 }