Dart: Futures -> Callbacks.

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

Index: mojo/dart/packages/mojo_services/lib/tracing/tracing.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/tracing/tracing.mojom.dart b/mojo/dart/packages/mojo_services/lib/tracing/tracing.mojom.dart
index 523ba71014525155f9ca5ede63114deab55f31e3..c8012e297b71d7c81166f9fd730297de00d35013 100644
--- a/mojo/dart/packages/mojo_services/lib/tracing/tracing.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/tracing/tracing.mojom.dart
@@ -19,6 +19,11 @@ class _TraceProviderStartTracingParams extends bindings.Struct {
 
   _TraceProviderStartTracingParams() : super(kVersions.last.size);
 
+  _TraceProviderStartTracingParams.init(
+    String this.categories, 
+    TraceRecorderInterface this.recorder
+  ) : super(kVersions.last.size);
+
   static _TraceProviderStartTracingParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -101,6 +106,9 @@ class _TraceProviderStopTracingParams extends bindings.Struct {
 
   _TraceProviderStopTracingParams() : super(kVersions.last.size);
 
+  _TraceProviderStopTracingParams.init(
+  ) : super(kVersions.last.size);
+
   static _TraceProviderStopTracingParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -160,6 +168,10 @@ class _TraceRecorderRecordParams extends bindings.Struct {
 
   _TraceRecorderRecordParams() : super(kVersions.last.size);
 
+  _TraceRecorderRecordParams.init(
+    String this.json
+  ) : super(kVersions.last.size);
+
   static _TraceRecorderRecordParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -233,6 +245,11 @@ class _TraceCollectorStartParams extends bindings.Struct {
 
   _TraceCollectorStartParams() : super(kVersions.last.size);
 
+  _TraceCollectorStartParams.init(
+    core.MojoDataPipeProducer this.stream, 
+    String this.categories
+  ) : super(kVersions.last.size);
+
   static _TraceCollectorStartParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -315,6 +332,9 @@ class _TraceCollectorStopAndFlushParams extends bindings.Struct {
 
   _TraceCollectorStopAndFlushParams() : super(kVersions.last.size);
 
+  _TraceCollectorStopAndFlushParams.init(
+  ) : super(kVersions.last.size);
+
   static _TraceCollectorStopAndFlushParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
@@ -369,14 +389,17 @@ const int _traceProviderMethodStartTracingName = 0;
 const int _traceProviderMethodStopTracingName = 1;
 
 class _TraceProviderServiceDescription 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 TraceProvider {
@@ -541,11 +564,11 @@ class _TraceProviderStubControl
 
 
 
-  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");
@@ -563,7 +586,6 @@ class _TraceProviderStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   TraceProvider get impl => _impl;
@@ -628,14 +650,17 @@ class TraceProviderStub
 const int _traceRecorderMethodRecordName = 0;
 
 class _TraceRecorderServiceDescription 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 TraceRecorder {
@@ -785,11 +810,11 @@ class _TraceRecorderStubControl
 
 
 
-  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");
@@ -804,7 +829,6 @@ class _TraceRecorderStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   TraceRecorder get impl => _impl;
@@ -867,14 +891,17 @@ const int _traceCollectorMethodStartName = 0;
 const int _traceCollectorMethodStopAndFlushName = 1;
 
 class _TraceCollectorServiceDescription 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 TraceCollector {
@@ -1039,11 +1066,11 @@ class _TraceCollectorStubControl
 
 
 
-  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");
@@ -1061,7 +1088,6 @@ class _TraceCollectorStubControl
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   TraceCollector get impl => _impl;