Dart: Refactor Stubs

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

Index: mojo/dart/packages/mojo_services/lib/mojo/tcp_server_socket.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/mojo/tcp_server_socket.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/tcp_server_socket.mojom.dart
index 0081bb6b161a382607e9c54d3ac51af59d55f4cc..15d5c6a9d3caf985760f91b6324c9b82b49556e1 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/tcp_server_socket.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/tcp_server_socket.mojom.dart
@@ -215,9 +215,9 @@ abstract class TcpServerSocket {
   dynamic accept(core.MojoDataPipeConsumer sendStream,core.MojoDataPipeProducer receiveStream,Object clientSocket,[Function responseFactory = null]);
 }
 
-
-class _TcpServerSocketProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _TcpServerSocketProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _TcpServerSocketProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
@@ -231,7 +231,6 @@ class _TcpServerSocketProxyControl extends bindings.ProxyMessageHandler
 
   String get serviceName => TcpServerSocket.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _tcpServerSocketMethodAcceptName:
@@ -268,9 +267,9 @@ class _TcpServerSocketProxyControl extends bindings.ProxyMessageHandler
   }
 }
 
-
-class TcpServerSocketProxy extends bindings.Proxy
-                              implements TcpServerSocket {
+class TcpServerSocketProxy
+    extends bindings.Proxy
+    implements TcpServerSocket {
   TcpServerSocketProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _TcpServerSocketProxyControl.fromEndpoint(endpoint));
@@ -308,29 +307,24 @@ class TcpServerSocketProxy extends bindings.Proxy
   }
 }
 
-
-class TcpServerSocketStub extends bindings.Stub {
+class _TcpServerSocketStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<TcpServerSocket> {
   TcpServerSocket _impl;
 
-  TcpServerSocketStub.fromEndpoint(
+  _TcpServerSocketStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [TcpServerSocket impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  TcpServerSocketStub.fromHandle(
+  _TcpServerSocketStubControl.fromHandle(
       core.MojoHandle handle, [TcpServerSocket impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  TcpServerSocketStub.unbound([this._impl]) : super.unbound();
-
-  static TcpServerSocketStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For TcpServerSocketStub"));
-    return new TcpServerSocketStub.fromEndpoint(endpoint);
-  }
+  _TcpServerSocketStubControl.unbound([this._impl]) : super.unbound();
 
 
   TcpServerSocketAcceptResponseParams _tcpServerSocketAcceptResponseParamsFactory(network_error_mojom.NetworkError result, net_address_mojom.NetAddress remoteAddress) {
@@ -398,9 +392,10 @@ class TcpServerSocketStub extends bindings.Stub {
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "TcpServerSocketStub($superString)";
+    return "_TcpServerSocketStubControl($superString)";
   }
 
   int get version => 0;
@@ -414,5 +409,34 @@ class TcpServerSocketStub extends bindings.Stub {
   }
 }
 
+class TcpServerSocketStub
+    extends bindings.Stub<TcpServerSocket>
+    implements TcpServerSocket {
+  TcpServerSocketStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [TcpServerSocket impl])
+      : super(new _TcpServerSocketStubControl.fromEndpoint(endpoint, impl));
+
+  TcpServerSocketStub.fromHandle(
+      core.MojoHandle handle, [TcpServerSocket impl])
+      : super(new _TcpServerSocketStubControl.fromHandle(handle, impl));
+
+  TcpServerSocketStub.unbound([TcpServerSocket impl])
+      : super(new _TcpServerSocketStubControl.unbound(impl));
+
+  static TcpServerSocketStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For TcpServerSocketStub"));
+    return new TcpServerSocketStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _TcpServerSocketStubControl.serviceDescription;
+
+
+  dynamic accept(core.MojoDataPipeConsumer sendStream,core.MojoDataPipeProducer receiveStream,Object clientSocket,[Function responseFactory = null]) {
+    return impl.accept(sendStream,receiveStream,clientSocket,responseFactory);
+  }
+}
+