Dart: Refactor Stubs

mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart

Index: mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart
diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart
index bd716d03a8b958a744fcfc7693f7467fea42d816..7429067cb5bba71ec2e11e8aed4a8ebc842ae46b 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart
@@ -360,9 +360,9 @@ abstract class ImportedInterface {
   void doSomething();
 }
 
-
-class _ImportedInterfaceProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _ImportedInterfaceProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _ImportedInterfaceProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
@@ -376,7 +376,6 @@ class _ImportedInterfaceProxyControl extends bindings.ProxyMessageHandler
 
   String get serviceName => ImportedInterface.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
@@ -393,9 +392,9 @@ class _ImportedInterfaceProxyControl extends bindings.ProxyMessageHandler
   }
 }
 
-
-class ImportedInterfaceProxy extends bindings.Proxy
-                              implements ImportedInterface {
+class ImportedInterfaceProxy
+    extends bindings.Proxy
+    implements ImportedInterface {
   ImportedInterfaceProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _ImportedInterfaceProxyControl.fromEndpoint(endpoint));
@@ -431,29 +430,24 @@ class ImportedInterfaceProxy extends bindings.Proxy
   }
 }
 
-
-class ImportedInterfaceStub extends bindings.Stub {
+class _ImportedInterfaceStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<ImportedInterface> {
   ImportedInterface _impl;
 
-  ImportedInterfaceStub.fromEndpoint(
+  _ImportedInterfaceStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [ImportedInterface impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  ImportedInterfaceStub.fromHandle(
+  _ImportedInterfaceStubControl.fromHandle(
       core.MojoHandle handle, [ImportedInterface impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  ImportedInterfaceStub.unbound([this._impl]) : super.unbound();
-
-  static ImportedInterfaceStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For ImportedInterfaceStub"));
-    return new ImportedInterfaceStub.fromEndpoint(endpoint);
-  }
+  _ImportedInterfaceStubControl.unbound([this._impl]) : super.unbound();
 
 
 
@@ -496,9 +490,10 @@ class ImportedInterfaceStub extends bindings.Stub {
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "ImportedInterfaceStub($superString)";
+    return "_ImportedInterfaceStubControl($superString)";
   }
 
   int get version => 0;
@@ -512,6 +507,35 @@ class ImportedInterfaceStub extends bindings.Stub {
   }
 }
 
+class ImportedInterfaceStub
+    extends bindings.Stub<ImportedInterface>
+    implements ImportedInterface {
+  ImportedInterfaceStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [ImportedInterface impl])
+      : super(new _ImportedInterfaceStubControl.fromEndpoint(endpoint, impl));
+
+  ImportedInterfaceStub.fromHandle(
+      core.MojoHandle handle, [ImportedInterface impl])
+      : super(new _ImportedInterfaceStubControl.fromHandle(handle, impl));
+
+  ImportedInterfaceStub.unbound([ImportedInterface impl])
+      : super(new _ImportedInterfaceStubControl.unbound(impl));
+
+  static ImportedInterfaceStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For ImportedInterfaceStub"));
+    return new ImportedInterfaceStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _ImportedInterfaceStubControl.serviceDescription;
+
+
+  void doSomething() {
+    return impl.doSomething();
+  }
+}
+
 
 mojom_types.RuntimeTypeInfo getRuntimeTypeInfo() => _runtimeTypeInfo ??
     _initRuntimeTypeInfo();