Dart: Futures -> Callbacks.

mojo/dart/packages/mojo/lib/src/control_message.dart

Index: mojo/dart/packages/mojo/lib/src/control_message.dart
diff --git a/mojo/dart/packages/mojo/lib/src/control_message.dart b/mojo/dart/packages/mojo/lib/src/control_message.dart
index 407800a729e66e3d4047727c75e3c6d1fb7669cc..aa944fcaf930e2c8b0b427fa5e468b0ca8275637 100644
--- a/mojo/dart/packages/mojo/lib/src/control_message.dart
+++ b/mojo/dart/packages/mojo/lib/src/control_message.dart
@@ -15,21 +15,19 @@ class ControlMessageHandler {
   static bool _isRunOrClose(ServiceMessage message) =>
       (message.header.type == icm.kRunOrClosePipeMessageId);
 
-  static Future<Message> handleMessage(StubControl stubControl,
-                                       int interface_version,
-                                       ServiceMessage message) {
+  static handleMessage(
+      StubControl stubControl, int interface_version, ServiceMessage message) {
     assert(isControlMessage(message));
     if (_isRun(message)) {
-      return _handleRun(stubControl, interface_version, message);
+      _handleRun(stubControl, interface_version, message);
     } else {
       assert(_isRunOrClose(message));
-      return _handleRunOrClose(stubControl, interface_version, message);
+      _handleRunOrClose(stubControl, interface_version, message);
     }
   }
 
-  static Future<Message> _handleRun(StubControl stubControl,
-                                    int interface_version,
-                                    ServiceMessage message) {
+  static void _handleRun(
+      StubControl stubControl, int interface_version, ServiceMessage message) {
     // Construct RunMessage response.
     var response = new icm.RunResponseMessageParams();
     response.reserved0 = 16;
@@ -37,16 +35,16 @@ class ControlMessageHandler {
     response.queryVersionResult = new icm.QueryVersionResult();
     response.queryVersionResult.version = interface_version;
     // Return response.
-    return new Future.value(
-        stubControl.buildResponseWithId(response,
-                                        icm.kRunMessageId,
-                                        message.header.requestId,
-                                        MessageHeader.kMessageIsResponse));
+    var responseMessage = stubControl.buildResponseWithId(
+        response,
+        icm.kRunMessageId,
+        message.header.requestId,
+        MessageHeader.kMessageIsResponse);
+    stubControl.sendResponse(responseMessage);
   }
 
-  static Future _handleRunOrClose(StubControl stubControl,
-                                  int interface_version,
-                                  ServiceMessage message) {
+  static void _handleRunOrClose(
+      StubControl stubControl, int interface_version, ServiceMessage message) {
     // Deserialize message.
     var params = icm.RunOrClosePipeMessageParams.deserialize(message.payload);
     // Grab required version.
@@ -55,6 +53,5 @@ class ControlMessageHandler {
       // Stub does not implement required version. Close the pipe immediately.
       stubControl.close(immediate: true);
     }
-    return null;
   }
 }