Dart: Futures -> Callbacks.

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

Index: mojo/dart/packages/mojo_services/lib/mojo/flog/flog.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/flog/flog.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/flog/flog.mojom.dart
index 6933cc486a2b551744752b494fda9cdac348ee98..eded636349f7c9646e50ced9dccc84d9ed886dd4 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/flog/flog.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/flog/flog.mojom.dart
@@ -23,6 +23,15 @@ class FlogDescription extends bindings.Struct {
 
   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);
@@ -163,6 +172,13 @@ class FlogEntry extends bindings.Struct {
 
   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);
@@ -274,6 +290,10 @@ class FlogChannelCreationEntryDetails extends bindings.Struct {
 
   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);
@@ -346,6 +366,10 @@ class FlogChannelMessageEntryDetails extends bindings.Struct {
 
   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);
@@ -419,6 +443,11 @@ class _FlogServiceCreateLoggerParams extends bindings.Struct {
 
   _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);
@@ -501,6 +530,9 @@ class _FlogServiceGetLogDescriptionsParams extends bindings.Struct {
 
   _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);
@@ -560,6 +592,10 @@ class FlogServiceGetLogDescriptionsResponseParams extends bindings.Struct {
 
   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);
@@ -649,6 +685,11 @@ class _FlogServiceCreateReaderParams extends bindings.Struct {
 
   _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);
@@ -734,6 +775,12 @@ class _FlogLoggerLogChannelCreationParams extends bindings.Struct {
 
   _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);
@@ -834,6 +881,12 @@ class _FlogLoggerLogChannelMessageParams extends bindings.Struct {
 
   _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);
@@ -933,6 +986,11 @@ class _FlogLoggerLogChannelDeletionParams extends bindings.Struct {
 
   _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);
@@ -1019,6 +1077,11 @@ class _FlogReaderGetEntriesParams extends bindings.Struct {
 
   _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);
@@ -1106,6 +1169,12 @@ class FlogReaderGetEntriesResponseParams extends bindings.Struct {
 
   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);
@@ -1321,14 +1390,17 @@ 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 {
@@ -1354,7 +1426,7 @@ abstract class FlogService {
     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);
 }
 
@@ -1405,18 +1477,14 @@ class _FlogServiceProxyControl
           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}");
@@ -1476,16 +1544,18 @@ class FlogServiceProxy
     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) {
@@ -1526,17 +1596,24 @@ class _FlogServiceStubControl
   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");
@@ -1548,24 +1625,7 @@ class _FlogServiceStubControl
         _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(
@@ -1576,7 +1636,6 @@ class _FlogServiceStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   FlogService get impl => _impl;
@@ -1633,8 +1692,8 @@ class FlogServiceStub
   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);
@@ -1646,14 +1705,17 @@ 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 {
@@ -1838,11 +1900,11 @@ class _FlogLoggerStubControl
 
 
 
-  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");
@@ -1867,7 +1929,6 @@ class _FlogLoggerStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   FlogLogger get impl => _impl;
@@ -1935,14 +1996,17 @@ class FlogLoggerStub
 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 {
@@ -1967,7 +2031,7 @@ abstract class FlogReader {
     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
@@ -2017,18 +2081,14 @@ class _FlogReaderProxyControl
           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}");
@@ -2073,18 +2133,20 @@ class FlogReaderProxy
   }
 
 
-  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);
   }
 }
 
@@ -2110,19 +2172,26 @@ class _FlogReaderStubControl
   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");
@@ -2131,30 +2200,12 @@ class _FlogReaderStubControl
       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;
@@ -2208,8 +2259,8 @@ class FlogReaderStub
   }
 
 
-  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);
   }
 }