Dart: Futures -> Callbacks.

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

 // WARNING: DO NOT EDIT. This file was generated by a program.
 // See $MOJO_SDK/tools/bindings/mojom_bindings_generator.py.
 
 library network_service_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/mojo/network_error.mojom.dart' as network_error_mojom;
 import 'package:mojo_services/mojo/cookie_store.mojom.dart' as cookie_store_mojom;
@@ skipping 10 matching lines @@
 
 
 class _NetworkServiceCreateUrlLoaderParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   url_loader_mojom.UrlLoaderInterfaceRequest loader = null;
 
   _NetworkServiceCreateUrlLoaderParams() : super(kVersions.last.size);
 
+  _NetworkServiceCreateUrlLoaderParams.init(
+    url_loader_mojom.UrlLoaderInterfaceRequest this.loader
+  ) : super(kVersions.last.size);
+
   static _NetworkServiceCreateUrlLoaderParams 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 _NetworkServiceCreateUrlLoaderParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 
 
 class _NetworkServiceGetCookieStoreParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   cookie_store_mojom.CookieStoreInterfaceRequest cookieStore = null;
 
   _NetworkServiceGetCookieStoreParams() : super(kVersions.last.size);
 
+  _NetworkServiceGetCookieStoreParams.init(
+    cookie_store_mojom.CookieStoreInterfaceRequest this.cookieStore
+  ) : super(kVersions.last.size);
+
   static _NetworkServiceGetCookieStoreParams 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 _NetworkServiceGetCookieStoreParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 
 
 class _NetworkServiceCreateWebSocketParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   web_socket_mojom.WebSocketInterfaceRequest socket = null;
 
   _NetworkServiceCreateWebSocketParams() : super(kVersions.last.size);
 
+  _NetworkServiceCreateWebSocketParams.init(
+    web_socket_mojom.WebSocketInterfaceRequest this.socket
+  ) : super(kVersions.last.size);
+
   static _NetworkServiceCreateWebSocketParams 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 _NetworkServiceCreateWebSocketParams decode(bindings.Decoder decoder0) {
@@ skipping 52 matching lines @@
 
 class _NetworkServiceCreateTcpBoundSocketParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   net_address_mojom.NetAddress localAddress = null;
   tcp_bound_socket_mojom.TcpBoundSocketInterfaceRequest boundSocket = null;
 
   _NetworkServiceCreateTcpBoundSocketParams() : super(kVersions.last.size);
 
+  _NetworkServiceCreateTcpBoundSocketParams.init(
+    net_address_mojom.NetAddress this.localAddress, 
+    tcp_bound_socket_mojom.TcpBoundSocketInterfaceRequest this.boundSocket
+  ) : super(kVersions.last.size);
+
   static _NetworkServiceCreateTcpBoundSocketParams 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 _NetworkServiceCreateTcpBoundSocketParams decode(bindings.Decoder decoder0) {
@@ skipping 65 matching lines @@
 
 class NetworkServiceCreateTcpBoundSocketResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   network_error_mojom.NetworkError result = null;
   net_address_mojom.NetAddress boundTo = null;
 
   NetworkServiceCreateTcpBoundSocketResponseParams() : super(kVersions.last.size);
 
+  NetworkServiceCreateTcpBoundSocketResponseParams.init(
+    network_error_mojom.NetworkError this.result, 
+    net_address_mojom.NetAddress this.boundTo
+  ) : super(kVersions.last.size);
+
   static NetworkServiceCreateTcpBoundSocketResponseParams 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 NetworkServiceCreateTcpBoundSocketResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 70 matching lines @@
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(32, 0)
   ];
   net_address_mojom.NetAddress remoteAddress = null;
   core.MojoDataPipeConsumer sendStream = null;
   core.MojoDataPipeProducer receiveStream = null;
   tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest clientSocket = null;
 
   _NetworkServiceCreateTcpConnectedSocketParams() : super(kVersions.last.size);
 
+  _NetworkServiceCreateTcpConnectedSocketParams.init(
+    net_address_mojom.NetAddress this.remoteAddress, 
+    core.MojoDataPipeConsumer this.sendStream, 
+    core.MojoDataPipeProducer this.receiveStream, 
+    tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest this.clientSocket
+  ) : super(kVersions.last.size);
+
   static _NetworkServiceCreateTcpConnectedSocketParams 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 _NetworkServiceCreateTcpConnectedSocketParams decode(bindings.Decoder decoder0) {
@@ skipping 89 matching lines @@
 
 class NetworkServiceCreateTcpConnectedSocketResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   network_error_mojom.NetworkError result = null;
   net_address_mojom.NetAddress localAddress = null;
 
   NetworkServiceCreateTcpConnectedSocketResponseParams() : super(kVersions.last.size);
 
+  NetworkServiceCreateTcpConnectedSocketResponseParams.init(
+    network_error_mojom.NetworkError this.result, 
+    net_address_mojom.NetAddress this.localAddress
+  ) : super(kVersions.last.size);
+
   static NetworkServiceCreateTcpConnectedSocketResponseParams 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 NetworkServiceCreateTcpConnectedSocketResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 67 matching lines @@
 
 
 class _NetworkServiceCreateUdpSocketParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   udp_socket_mojom.UdpSocketInterfaceRequest socket = null;
 
   _NetworkServiceCreateUdpSocketParams() : super(kVersions.last.size);
 
+  _NetworkServiceCreateUdpSocketParams.init(
+    udp_socket_mojom.UdpSocketInterfaceRequest this.socket
+  ) : super(kVersions.last.size);
+
   static _NetworkServiceCreateUdpSocketParams 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 _NetworkServiceCreateUdpSocketParams decode(bindings.Decoder decoder0) {
@@ skipping 52 matching lines @@
 
 class _NetworkServiceCreateHttpServerParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   net_address_mojom.NetAddress localAddress = null;
   http_server_mojom.HttpServerDelegateInterface delegate = null;
 
   _NetworkServiceCreateHttpServerParams() : super(kVersions.last.size);
 
+  _NetworkServiceCreateHttpServerParams.init(
+    net_address_mojom.NetAddress this.localAddress, 
+    http_server_mojom.HttpServerDelegateInterface this.delegate
+  ) : super(kVersions.last.size);
+
   static _NetworkServiceCreateHttpServerParams 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 _NetworkServiceCreateHttpServerParams decode(bindings.Decoder decoder0) {
@@ skipping 65 matching lines @@
 
 class NetworkServiceCreateHttpServerResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
   network_error_mojom.NetworkError result = null;
   net_address_mojom.NetAddress boundTo = null;
 
   NetworkServiceCreateHttpServerResponseParams() : super(kVersions.last.size);
 
+  NetworkServiceCreateHttpServerResponseParams.init(
+    network_error_mojom.NetworkError this.result, 
+    net_address_mojom.NetAddress this.boundTo
+  ) : super(kVersions.last.size);
+
   static NetworkServiceCreateHttpServerResponseParams 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 NetworkServiceCreateHttpServerResponseParams decode(bindings.Decoder decoder0) {
@@ skipping 67 matching lines @@
 
 
 class _NetworkServiceRegisterUrlLoaderInterceptorParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   url_loader_interceptor_mojom.UrlLoaderInterceptorFactoryInterface factory = null;
 
   _NetworkServiceRegisterUrlLoaderInterceptorParams() : super(kVersions.last.size);
 
+  _NetworkServiceRegisterUrlLoaderInterceptorParams.init(
+    url_loader_interceptor_mojom.UrlLoaderInterceptorFactoryInterface this.factory
+  ) : super(kVersions.last.size);
+
   static _NetworkServiceRegisterUrlLoaderInterceptorParams 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 _NetworkServiceRegisterUrlLoaderInterceptorParams decode(bindings.Decoder decoder0) {
@@ skipping 51 matching lines @@
 
 
 class _NetworkServiceCreateHostResolverParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(16, 0)
   ];
   host_resolver_mojom.HostResolverInterfaceRequest hostResolver = null;
 
   _NetworkServiceCreateHostResolverParams() : super(kVersions.last.size);
 
+  _NetworkServiceCreateHostResolverParams.init(
+    host_resolver_mojom.HostResolverInterfaceRequest this.hostResolver
+  ) : super(kVersions.last.size);
+
   static _NetworkServiceCreateHostResolverParams 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 _NetworkServiceCreateHostResolverParams decode(bindings.Decoder decoder0) {
@@ skipping 53 matching lines @@
 const int _networkServiceMethodGetCookieStoreName = 1;
 const int _networkServiceMethodCreateWebSocketName = 2;
 const int _networkServiceMethodCreateTcpBoundSocketName = 3;
 const int _networkServiceMethodCreateTcpConnectedSocketName = 4;
 const int _networkServiceMethodCreateUdpSocketName = 5;
 const int _networkServiceMethodCreateHttpServerName = 6;
 const int _networkServiceMethodRegisterUrlLoaderInterceptorName = 7;
 const int _networkServiceMethodCreateHostResolverName = 8;
 
 class _NetworkServiceServiceDescription 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 NetworkService {
   static const String serviceName = "mojo::NetworkService";
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _NetworkServiceServiceDescription();
     }
     return _cachedServiceDescription;
   }
 
   static NetworkServiceProxy connectToService(
       bindings.ServiceConnector s, String url, [String serviceName]) {
     NetworkServiceProxy p = new NetworkServiceProxy.unbound();
     String name = serviceName ?? NetworkService.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 createUrlLoader(url_loader_mojom.UrlLoaderInterfaceRequest loader);
   void getCookieStore(cookie_store_mojom.CookieStoreInterfaceRequest cookieStore);
   void createWebSocket(web_socket_mojom.WebSocketInterfaceRequest socket);
-  dynamic createTcpBoundSocket(net_address_mojom.NetAddress localAddress,tcp_bound_socket_mojom.TcpBoundSocketInterfaceRequest boundSocket,[Function responseFactory = null]);
-  dynamic createTcpConnectedSocket(net_address_mojom.NetAddress remoteAddress,core.MojoDataPipeConsumer sendStream,core.MojoDataPipeProducer receiveStream,tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest clientSocket,[Function responseFactory = null]);
+  void createTcpBoundSocket(net_address_mojom.NetAddress localAddress,tcp_bound_socket_mojom.TcpBoundSocketInterfaceRequest boundSocket,void callback(network_error_mojom.NetworkError result, net_address_mojom.NetAddress boundTo));
+  void createTcpConnectedSocket(net_address_mojom.NetAddress remoteAddress,core.MojoDataPipeConsumer sendStream,core.MojoDataPipeProducer receiveStream,tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest clientSocket,void callback(network_error_mojom.NetworkError result, net_address_mojom.NetAddress localAddress));
   void createUdpSocket(udp_socket_mojom.UdpSocketInterfaceRequest socket);
-  dynamic createHttpServer(net_address_mojom.NetAddress localAddress,http_server_mojom.HttpServerDelegateInterface delegate,[Function responseFactory = null]);
+  void createHttpServer(net_address_mojom.NetAddress localAddress,http_server_mojom.HttpServerDelegateInterface delegate,void callback(network_error_mojom.NetworkError result, net_address_mojom.NetAddress boundTo));
   void registerUrlLoaderInterceptor(url_loader_interceptor_mojom.UrlLoaderInterceptorFactoryInterface factory);
   void createHostResolver(host_resolver_mojom.HostResolverInterfaceRequest hostResolver);
 }
 
 abstract class NetworkServiceInterface
     implements bindings.MojoInterface<NetworkService>,
                NetworkService {
   factory NetworkServiceInterface([NetworkService impl]) =>
       new NetworkServiceStub.unbound(impl);
 
@@ skipping 31 matching lines @@
 
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _networkServiceMethodCreateTcpBoundSocketName:
         var r = NetworkServiceCreateTcpBoundSocketResponseParams.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.result , r.boundTo );
         break;
       case _networkServiceMethodCreateTcpConnectedSocketName:
         var r = NetworkServiceCreateTcpConnectedSocketResponseParams.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.result , r.localAddress );
         break;
       case _networkServiceMethodCreateHttpServerName:
         var r = NetworkServiceCreateHttpServerResponseParams.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.result , r.boundTo );
         break;
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   @override
   String toString() {
@@ skipping 66 matching lines @@
     }
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _NetworkServiceCreateWebSocketParams();
     params.socket = socket;
     ctrl.sendMessage(params,
         _networkServiceMethodCreateWebSocketName);
   }
-  dynamic createTcpBoundSocket(net_address_mojom.NetAddress localAddress,tcp_bound_socket_mojom.TcpBoundSocketInterfaceRequest boundSocket,[Function responseFactory = null]) {
+  void createTcpBoundSocket(net_address_mojom.NetAddress localAddress,tcp_bound_socket_mojom.TcpBoundSocketInterfaceRequest boundSocket,void callback(network_error_mojom.NetworkError result, net_address_mojom.NetAddress boundTo)) {
     if (impl != null) {
-      return new Future(() => impl.createTcpBoundSocket(localAddress,boundSocket,_NetworkServiceStubControl._networkServiceCreateTcpBoundSocketResponseParamsFactory));
+      impl.createTcpBoundSocket(localAddress,boundSocket,callback);
+      return;
     }
     var params = new _NetworkServiceCreateTcpBoundSocketParams();
     params.localAddress = localAddress;
     params.boundSocket = boundSocket;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _networkServiceMethodCreateTcpBoundSocketName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
-  dynamic createTcpConnectedSocket(net_address_mojom.NetAddress remoteAddress,core.MojoDataPipeConsumer sendStream,core.MojoDataPipeProducer receiveStream,tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest clientSocket,[Function responseFactory = null]) {
+  void createTcpConnectedSocket(net_address_mojom.NetAddress remoteAddress,core.MojoDataPipeConsumer sendStream,core.MojoDataPipeProducer receiveStream,tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest clientSocket,void callback(network_error_mojom.NetworkError result, net_address_mojom.NetAddress localAddress)) {
     if (impl != null) {
-      return new Future(() => impl.createTcpConnectedSocket(remoteAddress,sendStream,receiveStream,clientSocket,_NetworkServiceStubControl._networkServiceCreateTcpConnectedSocketResponseParamsFactory));
+      impl.createTcpConnectedSocket(remoteAddress,sendStream,receiveStream,clientSocket,callback);
+      return;
     }
     var params = new _NetworkServiceCreateTcpConnectedSocketParams();
     params.remoteAddress = remoteAddress;
     params.sendStream = sendStream;
     params.receiveStream = receiveStream;
     params.clientSocket = clientSocket;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _networkServiceMethodCreateTcpConnectedSocketName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
   void createUdpSocket(udp_socket_mojom.UdpSocketInterfaceRequest socket) {
     if (impl != null) {
       impl.createUdpSocket(socket);
       return;
     }
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _NetworkServiceCreateUdpSocketParams();
     params.socket = socket;
     ctrl.sendMessage(params,
         _networkServiceMethodCreateUdpSocketName);
   }
-  dynamic createHttpServer(net_address_mojom.NetAddress localAddress,http_server_mojom.HttpServerDelegateInterface delegate,[Function responseFactory = null]) {
+  void createHttpServer(net_address_mojom.NetAddress localAddress,http_server_mojom.HttpServerDelegateInterface delegate,void callback(network_error_mojom.NetworkError result, net_address_mojom.NetAddress boundTo)) {
     if (impl != null) {
-      return new Future(() => impl.createHttpServer(localAddress,delegate,_NetworkServiceStubControl._networkServiceCreateHttpServerResponseParamsFactory));
+      impl.createHttpServer(localAddress,delegate,callback);
+      return;
     }
     var params = new _NetworkServiceCreateHttpServerParams();
     params.localAddress = localAddress;
     params.delegate = delegate;
-    return ctrl.sendMessageWithRequestId(
+    ctrl.sendMessageWithRequestId(
         params,
         _networkServiceMethodCreateHttpServerName,
         -1,
-        bindings.MessageHeader.kMessageExpectsResponse);
+        bindings.MessageHeader.kMessageExpectsResponse,
+        callback);
   }
   void registerUrlLoaderInterceptor(url_loader_interceptor_mojom.UrlLoaderInterceptorFactoryInterface factory) {
     if (impl != null) {
       impl.registerUrlLoaderInterceptor(factory);
       return;
     }
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
@@ skipping 33 matching lines @@
       core.MojoHandle handle, [NetworkService impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
   _NetworkServiceStubControl.unbound([this._impl]) : super.unbound();
 
   String get serviceName => NetworkService.serviceName;
 
 
-  static NetworkServiceCreateTcpBoundSocketResponseParams _networkServiceCreateTcpBoundSocketResponseParamsFactory(network_error_mojom.NetworkError result, net_address_mojom.NetAddress boundTo) {
-    var result = new NetworkServiceCreateTcpBoundSocketResponseParams();
-    result.result = result;
-    result.boundTo = boundTo;
-    return result;
+  Function _networkServiceCreateTcpBoundSocketResponseParamsResponder(
+      int requestId) {
+  return (network_error_mojom.NetworkError result, net_address_mojom.NetAddress boundTo) {
+      var result = new NetworkServiceCreateTcpBoundSocketResponseParams();
+      result.result = result;
+      result.boundTo = boundTo;
+      sendResponse(buildResponseWithId(
+          result,
+          _networkServiceMethodCreateTcpBoundSocketName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  static NetworkServiceCreateTcpConnectedSocketResponseParams _networkServiceCreateTcpConnectedSocketResponseParamsFactory(network_error_mojom.NetworkError result, net_address_mojom.NetAddress localAddress) {
-    var result = new NetworkServiceCreateTcpConnectedSocketResponseParams();
-    result.result = result;
-    result.localAddress = localAddress;
-    return result;
+  Function _networkServiceCreateTcpConnectedSocketResponseParamsResponder(
+      int requestId) {
+  return (network_error_mojom.NetworkError result, net_address_mojom.NetAddress localAddress) {
+      var result = new NetworkServiceCreateTcpConnectedSocketResponseParams();
+      result.result = result;
+      result.localAddress = localAddress;
+      sendResponse(buildResponseWithId(
+          result,
+          _networkServiceMethodCreateTcpConnectedSocketName,
+          requestId,
+          bindings.MessageHeader.kMessageIsResponse));
+    };
   }
-  static NetworkServiceCreateHttpServerResponseParams _networkServiceCreateHttpServerResponseParamsFactory(network_error_mojom.NetworkError result, net_address_mojom.NetAddress boundTo) {
-    var result = new NetworkServiceCreateHttpServerResponseParams();
-    result.result = result;
-    result.boundTo = boundTo;
-    return result;
+  Function _networkServiceCreateHttpServerResponseParamsResponder(
+      int requestId) {
+  return (network_error_mojom.NetworkError result, net_address_mojom.NetAddress boundTo) {
+      var result = new NetworkServiceCreateHttpServerResponseParams();
+      result.result = result;
+      result.boundTo = boundTo;
+      sendResponse(buildResponseWithId(
+          result,
+          _networkServiceMethodCreateHttpServerName,
+          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 _networkServiceMethodCreateUrlLoaderName:
         var params = _NetworkServiceCreateUrlLoaderParams.deserialize(
             message.payload);
         _impl.createUrlLoader(params.loader);
         break;
       case _networkServiceMethodGetCookieStoreName:
         var params = _NetworkServiceGetCookieStoreParams.deserialize(
             message.payload);
         _impl.getCookieStore(params.cookieStore);
         break;
       case _networkServiceMethodCreateWebSocketName:
         var params = _NetworkServiceCreateWebSocketParams.deserialize(
             message.payload);
         _impl.createWebSocket(params.socket);
         break;
       case _networkServiceMethodCreateTcpBoundSocketName:
         var params = _NetworkServiceCreateTcpBoundSocketParams.deserialize(
             message.payload);
-        var response = _impl.createTcpBoundSocket(params.localAddress,params.boundSocket,_networkServiceCreateTcpBoundSocketResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _networkServiceMethodCreateTcpBoundSocketName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _networkServiceMethodCreateTcpBoundSocketName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.createTcpBoundSocket(params.localAddress, params.boundSocket, _networkServiceCreateTcpBoundSocketResponseParamsResponder(message.header.requestId));
         break;
       case _networkServiceMethodCreateTcpConnectedSocketName:
         var params = _NetworkServiceCreateTcpConnectedSocketParams.deserialize(
             message.payload);
-        var response = _impl.createTcpConnectedSocket(params.remoteAddress,params.sendStream,params.receiveStream,params.clientSocket,_networkServiceCreateTcpConnectedSocketResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _networkServiceMethodCreateTcpConnectedSocketName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _networkServiceMethodCreateTcpConnectedSocketName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.createTcpConnectedSocket(params.remoteAddress, params.sendStream, params.receiveStream, params.clientSocket, _networkServiceCreateTcpConnectedSocketResponseParamsResponder(message.header.requestId));
         break;
       case _networkServiceMethodCreateUdpSocketName:
         var params = _NetworkServiceCreateUdpSocketParams.deserialize(
             message.payload);
         _impl.createUdpSocket(params.socket);
         break;
       case _networkServiceMethodCreateHttpServerName:
         var params = _NetworkServiceCreateHttpServerParams.deserialize(
             message.payload);
-        var response = _impl.createHttpServer(params.localAddress,params.delegate,_networkServiceCreateHttpServerResponseParamsFactory);
-        if (response is Future) {
-          return response.then((response) {
-            if (response != null) {
-              return buildResponseWithId(
-                  response,
-                  _networkServiceMethodCreateHttpServerName,
-                  message.header.requestId,
-                  bindings.MessageHeader.kMessageIsResponse);
-            }
-          });
-        } else if (response != null) {
-          return buildResponseWithId(
-              response,
-              _networkServiceMethodCreateHttpServerName,
-              message.header.requestId,
-              bindings.MessageHeader.kMessageIsResponse);
-        }
+        _impl.createHttpServer(params.localAddress, params.delegate, _networkServiceCreateHttpServerResponseParamsResponder(message.header.requestId));
         break;
       case _networkServiceMethodRegisterUrlLoaderInterceptorName:
         var params = _NetworkServiceRegisterUrlLoaderInterceptorParams.deserialize(
             message.payload);
         _impl.registerUrlLoaderInterceptor(params.factory);
         break;
       case _networkServiceMethodCreateHostResolverName:
         var params = _NetworkServiceCreateHostResolverParams.deserialize(
             message.payload);
         _impl.createHostResolver(params.hostResolver);
         break;
       default:
         throw new bindings.MojoCodecError("Unexpected message name");
         break;
     }
-    return null;
   }
 
   NetworkService get impl => _impl;
   set impl(NetworkService d) {
     if (d == null) {
       throw new core.MojoApiError("$this: Cannot set a null implementation");
     }
     if (isBound && (_impl == null)) {
       beginHandlingEvents();
     }
@@ skipping 42 matching lines @@
 
   void createUrlLoader(url_loader_mojom.UrlLoaderInterfaceRequest loader) {
     return impl.createUrlLoader(loader);
   }
   void getCookieStore(cookie_store_mojom.CookieStoreInterfaceRequest cookieStore) {
     return impl.getCookieStore(cookieStore);
   }
   void createWebSocket(web_socket_mojom.WebSocketInterfaceRequest socket) {
     return impl.createWebSocket(socket);
   }
-  dynamic createTcpBoundSocket(net_address_mojom.NetAddress localAddress,tcp_bound_socket_mojom.TcpBoundSocketInterfaceRequest boundSocket,[Function responseFactory = null]) {
-    return impl.createTcpBoundSocket(localAddress,boundSocket,responseFactory);
+  void createTcpBoundSocket(net_address_mojom.NetAddress localAddress,tcp_bound_socket_mojom.TcpBoundSocketInterfaceRequest boundSocket,void callback(network_error_mojom.NetworkError result, net_address_mojom.NetAddress boundTo)) {
+    return impl.createTcpBoundSocket(localAddress,boundSocket,callback);
   }
-  dynamic createTcpConnectedSocket(net_address_mojom.NetAddress remoteAddress,core.MojoDataPipeConsumer sendStream,core.MojoDataPipeProducer receiveStream,tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest clientSocket,[Function responseFactory = null]) {
-    return impl.createTcpConnectedSocket(remoteAddress,sendStream,receiveStream,clientSocket,responseFactory);
+  void createTcpConnectedSocket(net_address_mojom.NetAddress remoteAddress,core.MojoDataPipeConsumer sendStream,core.MojoDataPipeProducer receiveStream,tcp_connected_socket_mojom.TcpConnectedSocketInterfaceRequest clientSocket,void callback(network_error_mojom.NetworkError result, net_address_mojom.NetAddress localAddress)) {
+    return impl.createTcpConnectedSocket(remoteAddress,sendStream,receiveStream,clientSocket,callback);
   }
   void createUdpSocket(udp_socket_mojom.UdpSocketInterfaceRequest socket) {
     return impl.createUdpSocket(socket);
   }
-  dynamic createHttpServer(net_address_mojom.NetAddress localAddress,http_server_mojom.HttpServerDelegateInterface delegate,[Function responseFactory = null]) {
-    return impl.createHttpServer(localAddress,delegate,responseFactory);
+  void createHttpServer(net_address_mojom.NetAddress localAddress,http_server_mojom.HttpServerDelegateInterface delegate,void callback(network_error_mojom.NetworkError result, net_address_mojom.NetAddress boundTo)) {
+    return impl.createHttpServer(localAddress,delegate,callback);
   }
   void registerUrlLoaderInterceptor(url_loader_interceptor_mojom.UrlLoaderInterceptorFactoryInterface factory) {
     return impl.registerUrlLoaderInterceptor(factory);
   }
   void createHostResolver(host_resolver_mojom.HostResolverInterfaceRequest hostResolver) {
     return impl.createHostResolver(hostResolver);
   }
 }