Dart: Refactors Proxies

mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart

Index: mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart
diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart
index 2c539f4c86eeb1aa07e1d8e21cdea7863c8c1084..c88ac53c6f4e7a2110250b41f9104565e4f2363f 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/test/echo_service.mojom.dart
@@ -460,24 +460,22 @@ abstract class EchoService {
 }
 
 
-class _EchoServiceProxyImpl extends bindings.Proxy {
-  _EchoServiceProxyImpl.fromEndpoint(
+class _EchoServiceProxyControl extends bindings.ProxyMessageHandler
+                                      implements bindings.ProxyControl {
+  _EchoServiceProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
-  _EchoServiceProxyImpl.fromHandle(core.MojoHandle handle) :
-      super.fromHandle(handle);
+  _EchoServiceProxyControl.fromHandle(
+      core.MojoHandle handle) : super.fromHandle(handle);
 
-  _EchoServiceProxyImpl.unbound() : super.unbound();
-
-  static _EchoServiceProxyImpl newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For _EchoServiceProxyImpl"));
-    return new _EchoServiceProxyImpl.fromEndpoint(endpoint);
-  }
+  _EchoServiceProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
-    new _EchoServiceServiceDescription();
+      new _EchoServiceServiceDescription();
+
+  String get serviceName => EchoService.serviceName;
 
+  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _echoServiceMethodEchoStringName:
@@ -527,77 +525,30 @@ class _EchoServiceProxyImpl extends bindings.Proxy {
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "_EchoServiceProxyImpl($superString)";
+    return "_EchoServiceProxyControl($superString)";
   }
 }
 
 
-class _EchoServiceProxyCalls implements EchoService {
-  _EchoServiceProxyImpl _proxyImpl;
-
-  _EchoServiceProxyCalls(this._proxyImpl);
-    dynamic echoString(String value,[Function responseFactory = null]) {
-      var params = new _EchoServiceEchoStringParams();
-      params.value = value;
-      return _proxyImpl.sendMessageWithRequestId(
-          params,
-          _echoServiceMethodEchoStringName,
-          -1,
-          bindings.MessageHeader.kMessageExpectsResponse);
-    }
-    dynamic delayedEchoString(String value,int millis,[Function responseFactory = null]) {
-      var params = new _EchoServiceDelayedEchoStringParams();
-      params.value = value;
-      params.millis = millis;
-      return _proxyImpl.sendMessageWithRequestId(
-          params,
-          _echoServiceMethodDelayedEchoStringName,
-          -1,
-          bindings.MessageHeader.kMessageExpectsResponse);
-    }
-    void swap() {
-      if (!_proxyImpl.isBound) {
-        _proxyImpl.proxyError("The Proxy is closed.");
-        return;
-      }
-      var params = new _EchoServiceSwapParams();
-      _proxyImpl.sendMessage(params, _echoServiceMethodSwapName);
-    }
-    void quit() {
-      if (!_proxyImpl.isBound) {
-        _proxyImpl.proxyError("The Proxy is closed.");
-        return;
-      }
-      var params = new _EchoServiceQuitParams();
-      _proxyImpl.sendMessage(params, _echoServiceMethodQuitName);
-    }
-}
-
-
-class EchoServiceProxy implements bindings.ProxyBase {
-  final bindings.Proxy impl;
-  EchoService ptr;
-
-  EchoServiceProxy(_EchoServiceProxyImpl proxyImpl) :
-      impl = proxyImpl,
-      ptr = new _EchoServiceProxyCalls(proxyImpl);
-
+class EchoServiceProxy extends bindings.Proxy
+                              implements EchoService {
   EchoServiceProxy.fromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) :
-      impl = new _EchoServiceProxyImpl.fromEndpoint(endpoint) {
-    ptr = new _EchoServiceProxyCalls(impl);
-  }
+      core.MojoMessagePipeEndpoint endpoint)
+      : super(new _EchoServiceProxyControl.fromEndpoint(endpoint));
 
-  EchoServiceProxy.fromHandle(core.MojoHandle handle) :
-      impl = new _EchoServiceProxyImpl.fromHandle(handle) {
-    ptr = new _EchoServiceProxyCalls(impl);
-  }
+  EchoServiceProxy.fromHandle(core.MojoHandle handle)
+      : super(new _EchoServiceProxyControl.fromHandle(handle));
+
+  EchoServiceProxy.unbound()
+      : super(new _EchoServiceProxyControl.unbound());
 
-  EchoServiceProxy.unbound() :
-      impl = new _EchoServiceProxyImpl.unbound() {
-    ptr = new _EchoServiceProxyCalls(impl);
+  static EchoServiceProxy newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For EchoServiceProxy"));
+    return new EchoServiceProxy.fromEndpoint(endpoint);
   }
 
   factory EchoServiceProxy.connectToService(
@@ -607,30 +558,43 @@ class EchoServiceProxy implements bindings.ProxyBase {
     return p;
   }
 
-  static EchoServiceProxy newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For EchoServiceProxy"));
-    return new EchoServiceProxy.fromEndpoint(endpoint);
-  }
 
-  String get serviceName => EchoService.serviceName;
-
-  Future close({bool immediate: false}) => impl.close(immediate: immediate);
-
-  Future responseOrError(Future f) => impl.responseOrError(f);
-
-  Future get errorFuture => impl.errorFuture;
-
-  int get version => impl.version;
-
-  Future<int> queryVersion() => impl.queryVersion();
-
-  void requireVersion(int requiredVersion) {
-    impl.requireVersion(requiredVersion);
-  }
-
-  String toString() {
-    return "EchoServiceProxy($impl)";
+  dynamic echoString(String value,[Function responseFactory = null]) {
+    var params = new _EchoServiceEchoStringParams();
+    params.value = value;
+    return ctrl.sendMessageWithRequestId(
+        params,
+        _echoServiceMethodEchoStringName,
+        -1,
+        bindings.MessageHeader.kMessageExpectsResponse);
+  }
+  dynamic delayedEchoString(String value,int millis,[Function responseFactory = null]) {
+    var params = new _EchoServiceDelayedEchoStringParams();
+    params.value = value;
+    params.millis = millis;
+    return ctrl.sendMessageWithRequestId(
+        params,
+        _echoServiceMethodDelayedEchoStringName,
+        -1,
+        bindings.MessageHeader.kMessageExpectsResponse);
+  }
+  void swap() {
+    if (!ctrl.isBound) {
+      ctrl.proxyError("The Proxy is closed.");
+      return;
+    }
+    var params = new _EchoServiceSwapParams();
+    ctrl.sendMessage(params,
+        _echoServiceMethodSwapName);
+  }
+  void quit() {
+    if (!ctrl.isBound) {
+      ctrl.proxyError("The Proxy is closed.");
+      return;
+    }
+    var params = new _EchoServiceQuitParams();
+    ctrl.sendMessage(params,
+        _echoServiceMethodQuitName);
   }
 }
 
@@ -785,7 +749,7 @@ mojom_types.RuntimeTypeInfo  _initRuntimeTypeInfo() {
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+xYS28TMRDeR4HQBlReUngcAqdwoOZYRULKgUiVkFBRuVQcolViyKLsA3u3iBtHfgJHjhz5ST1y5B+AzY7BmdiRFzUsQRlpOvE2s/b3+ZvxbjpeZbsQP0DE1/e1sS+8BeObwq8ILygv+v3heJodUXYSj6nl+3ch5/nx4XD0ZHjcl4l7i3l4/sEZ3M+H/FDL70HsQpz6VXwP0UPzKx4+QvwM8TvYF89seN1dA84L2vVrwneEA4qnUUKd+FZ5+D8dmAPTg3mW69sW/kLOLZxMs4QSVk6yJE4pI0n2OiOcjasPk4gVJMpzeVdO5N+RGHESpwVlL6Mx5YSKuUa8mmxPJiVOOPC6dL624LPkM4D97MF19b1P56p40K7i4WXzfn9VOgjN+63sIRrLvTZdV3YVePyJrGBx+sqM6yJgWDXfWG8Kdytwxytt34L3FmD+jfcBo29KsUIzbmWrxo3rbmDpZ988N3PVRc+Sf0m4lOZJNCupRQ83/hIvqoZMPHW0NfuWOlyFjm5DD5vTEc+zlNONjmrqqPcP6wj3YcXbwdb8/Vx48rV9wKbOmcd0Fr2jE9yOF3jbbqgfK/zdsF4dDSy41XPRAu75ttxYPXWA5199xV+PupL6uNNAXZl48WCtJmv9AS/+El7k49N54Uk8m8XczMv9Bvqw3l8CbWyrr93gbOrrHjzzmOpLO64251WNunq0RufVKcIX1OApWMJTG95jjt5GuUk/Ow2dT6coutaP7f3oOmCVOPUjqal6aTnowVvyuwHWQ1iDp9BBD8/K2MhP+z/Tg8S5jnr4EQAA//+qos9XSBMAAA==";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+xYvY4TMRDenwPCXUD8SstPEahCwZkyioSUglRICHQ01xBZe75k0W52WW8OwRPwCJSUlJQ8Ao9yJSUd2OwYnIkdNtGR1Z5upLmJfZnY3+dvxpsETmlXIH6AiOd72tgV3oLxLeFXhReMF/3+MJykeyw/ikJmef89yHm5/3w4ejrc78vE3cU8vP7gBD7PhXxfy+9C7EDMXOABooPWVzx8hPgZ4k+wL47Z8L47BpwXtPnrwneEA4pnNGGV+FZ5+D8BrIHpwTzL/W0LPxT+SjiZ8ZzEaUhjMk7TcczIJE0YeZ9TkqSvU8LzsHxxQPOC0CyTC3Ai/47EiJNoWrD8kIaMEyaWHfFy3V2ZlPwbD96fztsWvJa8enCuXZhX7/t2royf2mX8etl87t/VOfvmc1f2CI3lmZvmlV0DPn8jK/JoOjbjuggYNsU71p/CH3jVcUvrWXDfBux/cT/M2ZuZ2J4Zv7JN4cf1OLD0uR9ONauqk64l/5JwKdUjGs+YRR83N8yPqi1T/wq0vbuW+vwfuroDPW5OVzxLp5yd6WpNXXUboCvcrxV/k635z6vCl6udBzZ1Hz1hMX3HDnDbXuBvu+a+rXjo+avV18CCXz1PLeCfb9+111kAvP/Rh9uMepN6uVtjvZn4cWDPJmutwY+7hB/5+HVeeBLFccTN/DyosV/r/cfTxra663gnU3f34ZnJVHfa9XZ2v61Rb48beL8dI5zeCnx5S/hqw/ejvbc0M+lpp+b77BjFqnVl+/51AzBLvPoVVncdtSrow1nyOwXWh78CX34FfbyYRUae2qdUHxJvk/XxKwAA///0GO/NyBMAAA==";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);