Dart: Futures -> Callbacks.

mojo/dart/packages/mojo_services/lib/native_support/process.mojom.dart

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 library process_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;
 import 'package:mojo_services/mojo/files/file.mojom.dart' as file_mojom;
 import 'package:mojo_services/mojo/files/types.mojom.dart' as types_mojom;
 
 
 
 class _ProcessSpawnParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(64, 0)
   ];
   List<int> path = null;
   List<List<int>> argv = null;
   List<List<int>> envp = null;
   file_mojom.FileInterface stdinFile = null;
   file_mojom.FileInterface stdoutFile = null;
   file_mojom.FileInterface stderrFile = null;
   ProcessControllerInterfaceRequest processController = null;
 
   _ProcessSpawnParams() : super(kVersions.last.size);
 
+  _ProcessSpawnParams.init(
+    List<int> this.path, 
+    List<List<int>> this.argv, 
+    List<List<int>> this.envp, 
+    file_mojom.FileInterface this.stdinFile, 
+    file_mojom.FileInterface this.stdoutFile, 
+    file_mojom.FileInterface this.stderrFile, 
+    ProcessControllerInterfaceRequest this.processController
+  ) : super(kVersions.last.size);
+
   static _ProcessSpawnParams 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 _ProcessSpawnParams decode(bindings.Decoder decoder0) {
@@ skipping 157 matching lines @@
 
 
 class ProcessSpawnResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   types_mojom.Error error = null;
 
   ProcessSpawnResponseParams() : super(kVersions.last.size);
 
+  ProcessSpawnResponseParams.init(
+    types_mojom.Error this.error
+  ) : super(kVersions.last.size);
+
   static ProcessSpawnResponseParams 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 ProcessSpawnResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 60 matching lines @@
     const bindings.StructDataHeader(48, 0)
   ];
   List<int> path = null;
   List<List<int>> argv = null;
   List<List<int>> envp = null;
   file_mojom.FileInterface terminalFile = null;
   ProcessControllerInterfaceRequest processController = null;
 
   _ProcessSpawnWithTerminalParams() : super(kVersions.last.size);
 
+  _ProcessSpawnWithTerminalParams.init(
+    List<int> this.path, 
+    List<List<int>> this.argv, 
+    List<List<int>> this.envp, 
+    file_mojom.FileInterface this.terminalFile, 
+    ProcessControllerInterfaceRequest this.processController
+  ) : super(kVersions.last.size);
+
   static _ProcessSpawnWithTerminalParams 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 _ProcessSpawnWithTerminalParams decode(bindings.Decoder decoder0) {
@@ skipping 133 matching lines @@
 
 
 class ProcessSpawnWithTerminalResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   types_mojom.Error error = null;
 
   ProcessSpawnWithTerminalResponseParams() : super(kVersions.last.size);
 
+  ProcessSpawnWithTerminalResponseParams.init(
+    types_mojom.Error this.error
+  ) : super(kVersions.last.size);
+
   static ProcessSpawnWithTerminalResponseParams 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 ProcessSpawnWithTerminalResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 55 matching lines @@
 }
 
 
 class _ProcessControllerWaitParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(8, 0)
   ];
 
   _ProcessControllerWaitParams() : super(kVersions.last.size);
 
+  _ProcessControllerWaitParams.init(
+  ) : super(kVersions.last.size);
+
   static _ProcessControllerWaitParams 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 _ProcessControllerWaitParams decode(bindings.Decoder decoder0) {
@@ skipping 40 matching lines @@
 
 class ProcessControllerWaitResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   types_mojom.Error error = null;
   int exitStatus = 0;
 
   ProcessControllerWaitResponseParams() : super(kVersions.last.size);
 
+  ProcessControllerWaitResponseParams.init(
+    types_mojom.Error this.error, 
+    int this.exitStatus
+  ) : super(kVersions.last.size);
+
   static ProcessControllerWaitResponseParams 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 ProcessControllerWaitResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 69 matching lines @@
 
 
 class _ProcessControllerKillParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   int signal = 0;
 
   _ProcessControllerKillParams() : super(kVersions.last.size);
 
+  _ProcessControllerKillParams.init(
+    int this.signal
+  ) : super(kVersions.last.size);
+
   static _ProcessControllerKillParams 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 _ProcessControllerKillParams decode(bindings.Decoder decoder0) {
@@ skipping 52 matching lines @@
 
 
 class ProcessControllerKillResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   types_mojom.Error error = null;
 
   ProcessControllerKillResponseParams() : super(kVersions.last.size);
 
+  ProcessControllerKillResponseParams.init(
+    types_mojom.Error this.error
+  ) : super(kVersions.last.size);
+
   static ProcessControllerKillResponseParams 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 ProcessControllerKillResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
     Map map = new Map();
     map["error"] = error;
     return map;
   }
 }
 
 const int _processMethodSpawnName = 0;
 const int _processMethodSpawnWithTerminalName = 1;
 
 class _ProcessServiceDescription 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 Process {
   static const String serviceName = "native_support::Process";
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ProcessServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static ProcessProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     ProcessProxy p = new ProcessProxy.unbound();
     String name = serviceName ?? Process.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 spawn(List<int> path,List<List<int>> argv,List<List<int>> envp,file_mojom.FileInterface stdinFile,file_mojom.FileInterface stdoutFile,file_mojom.FileInterface stderrFile,ProcessControllerInterfaceRequest processController,[Function responseFactory = null]);
-  dynamic spawnWithTerminal(List<int> path,List<List<int>> argv,List<List<int>> envp,file_mojom.FileInterface terminalFile,ProcessControllerInterfaceRequest processController,[Function responseFactory = null]);
+  void spawn(List<int> path,List<List<int>> argv,List<List<int>> envp,file_mojom.FileInterface stdinFile,file_mojom.FileInterface stdoutFile,file_mojom.FileInterface stderrFile,ProcessControllerInterfaceRequest processController,void callback(types_mojom.Error error));
+  void spawnWithTerminal(List<int> path,List<List<int>> argv,List<List<int>> envp,file_mojom.FileInterface terminalFile,ProcessControllerInterfaceRequest processController,void callback(types_mojom.Error error));
 }
 
 abstract class ProcessInterface
     implements bindings.MojoInterface<Process>,
                Process {
   factory ProcessInterface([Process impl]) =>
       new ProcessStub.unbound(impl);
   factory ProcessInterface.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint,
       [Process impl]) =>
@@ skipping 22 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _processMethodSpawnName:
         var r = ProcessSpawnResponseParams.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.error );
         break;
       case _processMethodSpawnWithTerminalName:
         var r = ProcessSpawnWithTerminalResponseParams.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.error );
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   Process get impl => null;
   set impl(Process _) {
@@ skipping 22 matching lines @@
   ProcessProxy.unbound()
       : super(new _ProcessProxyControl.unbound());
 
   static ProcessProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ProcessProxy"));
     return new ProcessProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic spawn(List<int> path,List<List<int>> argv,List<List<int>> envp,file_mojom.FileInterface stdinFile,file_mojom.FileInterface stdoutFile,file_mojom.FileInterface stderrFile,ProcessControllerInterfaceRequest processController,[Function responseFactory = null]) {
+  void spawn(List<int> path,List<List<int>> argv,List<List<int>> envp,file_mojom.FileInterface stdinFile,file_mojom.FileInterface stdoutFile,file_mojom.FileInterface stderrFile,ProcessControllerInterfaceRequest processController,void callback(types_mojom.Error error)) {
     var params = new _ProcessSpawnParams();
     params.path = path;
     params.argv = argv;
     params.envp = envp;
     params.stdinFile = stdinFile;
     params.stdoutFile = stdoutFile;
     params.stderrFile = stderrFile;
     params.processController = processController;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _processMethodSpawnName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic spawnWithTerminal(List<int> path,List<List<int>> argv,List<List<int>> envp,file_mojom.FileInterface terminalFile,ProcessControllerInterfaceRequest processController,[Function responseFactory = null]) {
+  void spawnWithTerminal(List<int> path,List<List<int>> argv,List<List<int>> envp,file_mojom.FileInterface terminalFile,ProcessControllerInterfaceRequest processController,void callback(types_mojom.Error error)) {
     var params = new _ProcessSpawnWithTerminalParams();
     params.path = path;
     params.argv = argv;
     params.envp = envp;
     params.terminalFile = terminalFile;
     params.processController = processController;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _processMethodSpawnWithTerminalName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
 }
 
 class _ProcessStubControl
     extends bindings.StubMessageHandler
     implements bindings.StubControl<Process> {
   Process _impl;
 
   _ProcessStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [Process impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ProcessStubControl.fromHandle(
       core.MojoHandle handle, [Process impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ProcessStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => Process.serviceName;
 
 
-  ProcessSpawnResponseParams _processSpawnResponseParamsFactory(types_mojom.Error error) {
-    var result = new ProcessSpawnResponseParams();
-    result.error = error;
-    return result;
+  Function _processSpawnResponseParamsResponder(
+      int requestId) {
+  return (types_mojom.Error error) {
+      var result = new ProcessSpawnResponseParams();
+      result.error = error;
+      sendResponse(buildResponseWithId(
+          result,
+          _processMethodSpawnName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  ProcessSpawnWithTerminalResponseParams _processSpawnWithTerminalResponseParamsFactory(types_mojom.Error error) {
-    var result = new ProcessSpawnWithTerminalResponseParams();
-    result.error = error;
-    return result;
+  Function _processSpawnWithTerminalResponseParamsResponder(
+      int requestId) {
+  return (types_mojom.Error error) {
+      var result = new ProcessSpawnWithTerminalResponseParams();
+      result.error = error;
+      sendResponse(buildResponseWithId(
+          result,
+          _processMethodSpawnWithTerminalName,
+          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 _processMethodSpawnName:
         var params = _ProcessSpawnParams.deserialize(
             message.payload);
-        var response = _impl.spawn(params.path,params.argv,params.envp,params.stdinFile,params.stdoutFile,params.stderrFile,params.processController,_processSpawnResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _processMethodSpawnName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _processMethodSpawnName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.spawn(params.path, params.argv, params.envp, params.stdinFile, params.stdoutFile, params.stderrFile, params.processController, _processSpawnResponseParamsResponder(message.header.requestId));
         break;
       case _processMethodSpawnWithTerminalName:
         var params = _ProcessSpawnWithTerminalParams.deserialize(
             message.payload);
-        var response = _impl.spawnWithTerminal(params.path,params.argv,params.envp,params.terminalFile,params.processController,_processSpawnWithTerminalResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _processMethodSpawnWithTerminalName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _processMethodSpawnWithTerminalName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.spawnWithTerminal(params.path, params.argv, params.envp, params.terminalFile, params.processController, _processSpawnWithTerminalResponseParamsResponder(message.header.requestId));
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   Process get impl => _impl;
   set impl(Process 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, [Process impl])
       : super(new _ProcessStubControl.fromHandle(handle, impl));
 
   static ProcessStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ProcessStub"));
     return new ProcessStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic spawn(List<int> path,List<List<int>> argv,List<List<int>> envp,file_mojom.FileInterface stdinFile,file_mojom.FileInterface stdoutFile,file_mojom.FileInterface stderrFile,ProcessControllerInterfaceRequest processController,[Function responseFactory = null]) {
-    return impl.spawn(path,argv,envp,stdinFile,stdoutFile,stderrFile,processController,responseFactory);
+  void spawn(List<int> path,List<List<int>> argv,List<List<int>> envp,file_mojom.FileInterface stdinFile,file_mojom.FileInterface stdoutFile,file_mojom.FileInterface stderrFile,ProcessControllerInterfaceRequest processController,void callback(types_mojom.Error error)) {
+    return impl.spawn(path,argv,envp,stdinFile,stdoutFile,stderrFile,processController,callback);
   }
-  dynamic spawnWithTerminal(List<int> path,List<List<int>> argv,List<List<int>> envp,file_mojom.FileInterface terminalFile,ProcessControllerInterfaceRequest processController,[Function responseFactory = null]) {
-    return impl.spawnWithTerminal(path,argv,envp,terminalFile,processController,responseFactory);
+  void spawnWithTerminal(List<int> path,List<List<int>> argv,List<List<int>> envp,file_mojom.FileInterface terminalFile,ProcessControllerInterfaceRequest processController,void callback(types_mojom.Error error)) {
+    return impl.spawnWithTerminal(path,argv,envp,terminalFile,processController,callback);
   }
 }
 
 const int _processControllerMethodWaitName = 0;
 const int _processControllerMethodKillName = 1;
 
 class _ProcessControllerServiceDescription 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 ProcessController {
   static const String serviceName = null;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ProcessControllerServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static ProcessControllerProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     ProcessControllerProxy p = new ProcessControllerProxy.unbound();
     String name = serviceName ?? ProcessController.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 wait([Function responseFactory = null]);
-  dynamic kill(int signal,[Function responseFactory = null]);
+  void wait(void callback(types_mojom.Error error, int exitStatus));
+  void kill(int signal,void callback(types_mojom.Error error));
 }
 
 abstract class ProcessControllerInterface
     implements bindings.MojoInterface<ProcessController>,
                ProcessController {
   factory ProcessControllerInterface([ProcessController impl]) =>
       new ProcessControllerStub.unbound(impl);
   factory ProcessControllerInterface.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint,
       [ProcessController impl]) =>
@@ skipping 22 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _processControllerMethodWaitName:
         var r = ProcessControllerWaitResponseParams.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.error , r.exitStatus );
         break;
       case _processControllerMethodKillName:
         var r = ProcessControllerKillResponseParams.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.error );
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   ProcessController get impl => null;
   set impl(ProcessController _) {
@@ skipping 22 matching lines @@
   ProcessControllerProxy.unbound()
       : super(new _ProcessControllerProxyControl.unbound());
 
   static ProcessControllerProxy newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ProcessControllerProxy"));
     return new ProcessControllerProxy.fromEndpoint(endpoint);
   }
 
 
-  dynamic wait([Function responseFactory = null]) {
+  void wait(void callback(types_mojom.Error error, int exitStatus)) {
     var params = new _ProcessControllerWaitParams();
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _processControllerMethodWaitName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic kill(int signal,[Function responseFactory = null]) {
+  void kill(int signal,void callback(types_mojom.Error error)) {
     var params = new _ProcessControllerKillParams();
     params.signal = signal;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _processControllerMethodKillName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
 }
 
 class _ProcessControllerStubControl
     extends bindings.StubMessageHandler
     implements bindings.StubControl<ProcessController> {
   ProcessController _impl;
 
   _ProcessControllerStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [ProcessController impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ProcessControllerStubControl.fromHandle(
       core.MojoHandle handle, [ProcessController impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _ProcessControllerStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => ProcessController.serviceName;
 
 
-  ProcessControllerWaitResponseParams _processControllerWaitResponseParamsFactory(types_mojom.Error error, int exitStatus) {
-    var result = new ProcessControllerWaitResponseParams();
-    result.error = error;
-    result.exitStatus = exitStatus;
-    return result;
+  Function _processControllerWaitResponseParamsResponder(
+      int requestId) {
+  return (types_mojom.Error error, int exitStatus) {
+      var result = new ProcessControllerWaitResponseParams();
+      result.error = error;
+      result.exitStatus = exitStatus;
+      sendResponse(buildResponseWithId(
+          result,
+          _processControllerMethodWaitName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  ProcessControllerKillResponseParams _processControllerKillResponseParamsFactory(types_mojom.Error error) {
-    var result = new ProcessControllerKillResponseParams();
-    result.error = error;
-    return result;
+  Function _processControllerKillResponseParamsResponder(
+      int requestId) {
+  return (types_mojom.Error error) {
+      var result = new ProcessControllerKillResponseParams();
+      result.error = error;
+      sendResponse(buildResponseWithId(
+          result,
+          _processControllerMethodKillName,
+          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 _processControllerMethodWaitName:
-        var response = _impl.wait(_processControllerWaitResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _processControllerMethodWaitName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _processControllerMethodWaitName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.wait(_processControllerWaitResponseParamsResponder(message.header.requestId));
         break;
       case _processControllerMethodKillName:
         var params = _ProcessControllerKillParams.deserialize(
             message.payload);
-        var response = _impl.kill(params.signal,_processControllerKillResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _processControllerMethodKillName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _processControllerMethodKillName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.kill(params.signal, _processControllerKillResponseParamsResponder(message.header.requestId));
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   ProcessController get impl => _impl;
   set impl(ProcessController 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, [ProcessController impl])
       : super(new _ProcessControllerStubControl.fromHandle(handle, impl));
 
   static ProcessControllerStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For ProcessControllerStub"));
     return new ProcessControllerStub.fromEndpoint(endpoint);
   }
 
 
-  dynamic wait([Function responseFactory = null]) {
-    return impl.wait(responseFactory);
+  void wait(void callback(types_mojom.Error error, int exitStatus)) {
+    return impl.wait(callback);
   }
-  dynamic kill(int signal,[Function responseFactory = null]) {
-    return impl.kill(signal,responseFactory);
+  void kill(int signal,void callback(types_mojom.Error error)) {
+    return impl.kill(signal,callback);
   }
 }