Dart: Refactor Stubs

mojo/dart/packages/_mojo_for_test_only/lib/regression_tests/regression_tests.mojom.dart

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 library regression_tests_mojom;
 import 'dart:async';
 import 'dart:collection';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:typed_data';
@@ skipping 1924 matching lines @@
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class CheckMethodWithEmptyResponse {
   static const String serviceName = null;
   dynamic withoutParameterAndEmptyResponse([Function responseFactory = null]);
   dynamic withParameterAndEmptyResponse(bool b,[Function responseFactory = null]);
 }
 
-
-class _CheckMethodWithEmptyResponseProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _CheckMethodWithEmptyResponseProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _CheckMethodWithEmptyResponseProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _CheckMethodWithEmptyResponseProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _CheckMethodWithEmptyResponseProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _CheckMethodWithEmptyResponseServiceDescription();
 
   String get serviceName => CheckMethodWithEmptyResponse.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _checkMethodWithEmptyResponseMethodWithoutParameterAndEmptyResponseName:
         var r = CheckMethodWithEmptyResponseWithoutParameterAndEmptyResponseResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
         Completer c = completerMap[message.header.requestId];
@@ skipping 36 matching lines @@
     }
   }
 
   @override
   String toString() {
     var superString = super.toString();
     return "_CheckMethodWithEmptyResponseProxyControl($superString)";
   }
 }
 
-
-class CheckMethodWithEmptyResponseProxy extends bindings.Proxy
-                              implements CheckMethodWithEmptyResponse {
+class CheckMethodWithEmptyResponseProxy
+    extends bindings.Proxy
+    implements CheckMethodWithEmptyResponse {
   CheckMethodWithEmptyResponseProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _CheckMethodWithEmptyResponseProxyControl.fromEndpoint(endpoint));
 
   CheckMethodWithEmptyResponseProxy.fromHandle(core.MojoHandle handle)
       : super(new _CheckMethodWithEmptyResponseProxyControl.fromHandle(handle));
 
   CheckMethodWithEmptyResponseProxy.unbound()
       : super(new _CheckMethodWithEmptyResponseProxyControl.unbound());
 
@@ skipping 23 matching lines @@
     var params = new _CheckMethodWithEmptyResponseWithParameterAndEmptyResponseParams();
     params.b = b;
     return ctrl.sendMessageWithRequestId(
         params,
         _checkMethodWithEmptyResponseMethodWithParameterAndEmptyResponseName,
         -1,
         bindings.MessageHeader.kMessageExpectsResponse);
   }
 }
 
-
-class CheckMethodWithEmptyResponseStub extends bindings.Stub {
+class _CheckMethodWithEmptyResponseStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<CheckMethodWithEmptyResponse> {
   CheckMethodWithEmptyResponse _impl;
 
-  CheckMethodWithEmptyResponseStub.fromEndpoint(
+  _CheckMethodWithEmptyResponseStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [CheckMethodWithEmptyResponse impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  CheckMethodWithEmptyResponseStub.fromHandle(
+  _CheckMethodWithEmptyResponseStubControl.fromHandle(
       core.MojoHandle handle, [CheckMethodWithEmptyResponse impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  CheckMethodWithEmptyResponseStub.unbound([this._impl]) : super.unbound();
-
-  static CheckMethodWithEmptyResponseStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For CheckMethodWithEmptyResponseStub"));
-    return new CheckMethodWithEmptyResponseStub.fromEndpoint(endpoint);
-  }
+  _CheckMethodWithEmptyResponseStubControl.unbound([this._impl]) : super.unbound();
 
 
   CheckMethodWithEmptyResponseWithoutParameterAndEmptyResponseResponseParams _checkMethodWithEmptyResponseWithoutParameterAndEmptyResponseResponseParamsFactory() {
     var result = new CheckMethodWithEmptyResponseWithoutParameterAndEmptyResponseResponseParams();
     return result;
   }
   CheckMethodWithEmptyResponseWithParameterAndEmptyResponseResponseParams _checkMethodWithEmptyResponseWithParameterAndEmptyResponseResponseParamsFactory() {
     var result = new CheckMethodWithEmptyResponseWithParameterAndEmptyResponseResponseParams();
     return result;
   }
@@ skipping 69 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "CheckMethodWithEmptyResponseStub($superString)";
+    return "_CheckMethodWithEmptyResponseStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _CheckMethodWithEmptyResponseServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class CheckMethodWithEmptyResponseStub
+    extends bindings.Stub<CheckMethodWithEmptyResponse>
+    implements CheckMethodWithEmptyResponse {
+  CheckMethodWithEmptyResponseStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [CheckMethodWithEmptyResponse impl])
+      : super(new _CheckMethodWithEmptyResponseStubControl.fromEndpoint(endpoint, impl));
+
+  CheckMethodWithEmptyResponseStub.fromHandle(
+      core.MojoHandle handle, [CheckMethodWithEmptyResponse impl])
+      : super(new _CheckMethodWithEmptyResponseStubControl.fromHandle(handle, impl));
+
+  CheckMethodWithEmptyResponseStub.unbound([CheckMethodWithEmptyResponse impl])
+      : super(new _CheckMethodWithEmptyResponseStubControl.unbound(impl));
+
+  static CheckMethodWithEmptyResponseStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For CheckMethodWithEmptyResponseStub"));
+    return new CheckMethodWithEmptyResponseStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _CheckMethodWithEmptyResponseStubControl.serviceDescription;
+
+
+  dynamic withoutParameterAndEmptyResponse([Function responseFactory = null]) {
+    return impl.withoutParameterAndEmptyResponse(responseFactory);
+  }
+  dynamic withParameterAndEmptyResponse(bool b,[Function responseFactory = null]) {
+    return impl.withParameterAndEmptyResponse(b,responseFactory);
+  }
+}
+
 const int _checkNameCollisionMethodWithNameCollisionName = 0;
 
 class _CheckNameCollisionServiceDescription implements service_describer.ServiceDescription {
   dynamic getTopLevelInterface([Function responseFactory]) =>
       responseFactory(null);
 
   dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
       responseFactory(null);
 
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class CheckNameCollision {
   static const String serviceName = null;
   dynamic withNameCollision(bool message,bool response,[Function responseFactory = null]);
 }
 
-
-class _CheckNameCollisionProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _CheckNameCollisionProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _CheckNameCollisionProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _CheckNameCollisionProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _CheckNameCollisionProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _CheckNameCollisionServiceDescription();
 
   String get serviceName => CheckNameCollision.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _checkNameCollisionMethodWithNameCollisionName:
         var r = CheckNameCollisionWithNameCollisionResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
         Completer c = completerMap[message.header.requestId];
@@ skipping 16 matching lines @@
     }
   }
 
   @override
   String toString() {
     var superString = super.toString();
     return "_CheckNameCollisionProxyControl($superString)";
   }
 }
 
-
-class CheckNameCollisionProxy extends bindings.Proxy
-                              implements CheckNameCollision {
+class CheckNameCollisionProxy
+    extends bindings.Proxy
+    implements CheckNameCollision {
   CheckNameCollisionProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _CheckNameCollisionProxyControl.fromEndpoint(endpoint));
 
   CheckNameCollisionProxy.fromHandle(core.MojoHandle handle)
       : super(new _CheckNameCollisionProxyControl.fromHandle(handle));
 
   CheckNameCollisionProxy.unbound()
       : super(new _CheckNameCollisionProxyControl.unbound());
 
@@ skipping 16 matching lines @@
     params.message = message;
     params.response = response;
     return ctrl.sendMessageWithRequestId(
         params,
         _checkNameCollisionMethodWithNameCollisionName,
         -1,
         bindings.MessageHeader.kMessageExpectsResponse);
   }
 }
 
-
-class CheckNameCollisionStub extends bindings.Stub {
+class _CheckNameCollisionStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<CheckNameCollision> {
   CheckNameCollision _impl;
 
-  CheckNameCollisionStub.fromEndpoint(
+  _CheckNameCollisionStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [CheckNameCollision impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  CheckNameCollisionStub.fromHandle(
+  _CheckNameCollisionStubControl.fromHandle(
       core.MojoHandle handle, [CheckNameCollision impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  CheckNameCollisionStub.unbound([this._impl]) : super.unbound();
-
-  static CheckNameCollisionStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For CheckNameCollisionStub"));
-    return new CheckNameCollisionStub.fromEndpoint(endpoint);
-  }
+  _CheckNameCollisionStubControl.unbound([this._impl]) : super.unbound();
 
 
   CheckNameCollisionWithNameCollisionResponseParams _checkNameCollisionWithNameCollisionResponseParamsFactory(bool message, bool response) {
     var result = new CheckNameCollisionWithNameCollisionResponseParams();
     result.message = message;
     result.response = response;
     return result;
   }
 
   dynamic handleMessage(bindings.ServiceMessage message) {
@@ skipping 47 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "CheckNameCollisionStub($superString)";
+    return "_CheckNameCollisionStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _CheckNameCollisionServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class CheckNameCollisionStub
+    extends bindings.Stub<CheckNameCollision>
+    implements CheckNameCollision {
+  CheckNameCollisionStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [CheckNameCollision impl])
+      : super(new _CheckNameCollisionStubControl.fromEndpoint(endpoint, impl));
+
+  CheckNameCollisionStub.fromHandle(
+      core.MojoHandle handle, [CheckNameCollision impl])
+      : super(new _CheckNameCollisionStubControl.fromHandle(handle, impl));
+
+  CheckNameCollisionStub.unbound([CheckNameCollision impl])
+      : super(new _CheckNameCollisionStubControl.unbound(impl));
+
+  static CheckNameCollisionStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For CheckNameCollisionStub"));
+    return new CheckNameCollisionStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _CheckNameCollisionStubControl.serviceDescription;
+
+
+  dynamic withNameCollision(bool message,bool response,[Function responseFactory = null]) {
+    return impl.withNameCollision(message,response,responseFactory);
+  }
+}
+
 const int _checkEnumCapsMethodSetEnumWithInternalAllCapsName = 0;
 
 class _CheckEnumCapsServiceDescription implements service_describer.ServiceDescription {
   dynamic getTopLevelInterface([Function responseFactory]) =>
       responseFactory(null);
 
   dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
       responseFactory(null);
 
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class CheckEnumCaps {
   static const String serviceName = null;
   void setEnumWithInternalAllCaps(EnumWithInternalAllCaps e);
 }
 
-
-class _CheckEnumCapsProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _CheckEnumCapsProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _CheckEnumCapsProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _CheckEnumCapsProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _CheckEnumCapsProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _CheckEnumCapsServiceDescription();
 
   String get serviceName => CheckEnumCaps.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   @override
   String toString() {
     var superString = super.toString();
     return "_CheckEnumCapsProxyControl($superString)";
   }
 }
 
-
-class CheckEnumCapsProxy extends bindings.Proxy
-                              implements CheckEnumCaps {
+class CheckEnumCapsProxy
+    extends bindings.Proxy
+    implements CheckEnumCaps {
   CheckEnumCapsProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _CheckEnumCapsProxyControl.fromEndpoint(endpoint));
 
   CheckEnumCapsProxy.fromHandle(core.MojoHandle handle)
       : super(new _CheckEnumCapsProxyControl.fromHandle(handle));
 
   CheckEnumCapsProxy.unbound()
       : super(new _CheckEnumCapsProxyControl.unbound());
 
@@ skipping 16 matching lines @@
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _CheckEnumCapsSetEnumWithInternalAllCapsParams();
     params.e = e;
     ctrl.sendMessage(params,
         _checkEnumCapsMethodSetEnumWithInternalAllCapsName);
   }
 }
 
-
-class CheckEnumCapsStub extends bindings.Stub {
+class _CheckEnumCapsStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<CheckEnumCaps> {
   CheckEnumCaps _impl;
 
-  CheckEnumCapsStub.fromEndpoint(
+  _CheckEnumCapsStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [CheckEnumCaps impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  CheckEnumCapsStub.fromHandle(
+  _CheckEnumCapsStubControl.fromHandle(
       core.MojoHandle handle, [CheckEnumCaps impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  CheckEnumCapsStub.unbound([this._impl]) : super.unbound();
-
-  static CheckEnumCapsStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For CheckEnumCapsStub"));
-    return new CheckEnumCapsStub.fromEndpoint(endpoint);
-  }
+  _CheckEnumCapsStubControl.unbound([this._impl]) : super.unbound();
 
 
 
   dynamic handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
       return bindings.ControlMessageHandler.handleMessage(this,
                                                           0,
                                                           message);
     }
     if (_impl == null) {
@@ skipping 24 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "CheckEnumCapsStub($superString)";
+    return "_CheckEnumCapsStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _CheckEnumCapsServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class CheckEnumCapsStub
+    extends bindings.Stub<CheckEnumCaps>
+    implements CheckEnumCaps {
+  CheckEnumCapsStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [CheckEnumCaps impl])
+      : super(new _CheckEnumCapsStubControl.fromEndpoint(endpoint, impl));
+
+  CheckEnumCapsStub.fromHandle(
+      core.MojoHandle handle, [CheckEnumCaps impl])
+      : super(new _CheckEnumCapsStubControl.fromHandle(handle, impl));
+
+  CheckEnumCapsStub.unbound([CheckEnumCaps impl])
+      : super(new _CheckEnumCapsStubControl.unbound(impl));
+
+  static CheckEnumCapsStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For CheckEnumCapsStub"));
+    return new CheckEnumCapsStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _CheckEnumCapsStubControl.serviceDescription;
+
+
+  void setEnumWithInternalAllCaps(EnumWithInternalAllCaps e) {
+    return impl.setEnumWithInternalAllCaps(e);
+  }
+}
+
 const int _testInterfaceMethodSomeMessageName = 0;
 
 class _TestInterfaceServiceDescription implements service_describer.ServiceDescription {
   dynamic getTopLevelInterface([Function responseFactory]) =>
       responseFactory(null);
 
   dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
       responseFactory(null);
 
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class TestInterface {
   static const String serviceName = null;
   void someMessage();
 }
 
-
-class _TestInterfaceProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _TestInterfaceProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _TestInterfaceProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _TestInterfaceProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _TestInterfaceProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _TestInterfaceServiceDescription();
 
   String get serviceName => TestInterface.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       default:
         proxyError("Unexpected message type: ${message.header.type}");
         close(immediate: true);
         break;
     }
   }
 
   @override
   String toString() {
     var superString = super.toString();
     return "_TestInterfaceProxyControl($superString)";
   }
 }
 
-
-class TestInterfaceProxy extends bindings.Proxy
-                              implements TestInterface {
+class TestInterfaceProxy
+    extends bindings.Proxy
+    implements TestInterface {
   TestInterfaceProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _TestInterfaceProxyControl.fromEndpoint(endpoint));
 
   TestInterfaceProxy.fromHandle(core.MojoHandle handle)
       : super(new _TestInterfaceProxyControl.fromHandle(handle));
 
   TestInterfaceProxy.unbound()
       : super(new _TestInterfaceProxyControl.unbound());
 
@@ skipping 15 matching lines @@
     if (!ctrl.isBound) {
       ctrl.proxyError("The Proxy is closed.");
       return;
     }
     var params = new _TestInterfaceSomeMessageParams();
     ctrl.sendMessage(params,
         _testInterfaceMethodSomeMessageName);
   }
 }
 
-
-class TestInterfaceStub extends bindings.Stub {
+class _TestInterfaceStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<TestInterface> {
   TestInterface _impl;
 
-  TestInterfaceStub.fromEndpoint(
+  _TestInterfaceStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [TestInterface impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  TestInterfaceStub.fromHandle(
+  _TestInterfaceStubControl.fromHandle(
       core.MojoHandle handle, [TestInterface impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  TestInterfaceStub.unbound([this._impl]) : super.unbound();
-
-  static TestInterfaceStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For TestInterfaceStub"));
-    return new TestInterfaceStub.fromEndpoint(endpoint);
-  }
+  _TestInterfaceStubControl.unbound([this._impl]) : super.unbound();
 
 
 
   dynamic handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
       return bindings.ControlMessageHandler.handleMessage(this,
                                                           0,
                                                           message);
     }
     if (_impl == null) {
@@ skipping 22 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "TestInterfaceStub($superString)";
+    return "_TestInterfaceStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _TestInterfaceServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class TestInterfaceStub
+    extends bindings.Stub<TestInterface>
+    implements TestInterface {
+  TestInterfaceStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [TestInterface impl])
+      : super(new _TestInterfaceStubControl.fromEndpoint(endpoint, impl));
+
+  TestInterfaceStub.fromHandle(
+      core.MojoHandle handle, [TestInterface impl])
+      : super(new _TestInterfaceStubControl.fromHandle(handle, impl));
+
+  TestInterfaceStub.unbound([TestInterface impl])
+      : super(new _TestInterfaceStubControl.unbound(impl));
+
+  static TestInterfaceStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For TestInterfaceStub"));
+    return new TestInterfaceStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _TestInterfaceStubControl.serviceDescription;
+
+
+  void someMessage() {
+    return impl.someMessage();
+  }
+}
+
 const int _regression551MethodGetName = 0;
 
 class _Regression551ServiceDescription implements service_describer.ServiceDescription {
   dynamic getTopLevelInterface([Function responseFactory]) =>
       responseFactory(null);
 
   dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
       responseFactory(null);
 
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class Regression551 {
   static const String serviceName = null;
   dynamic get(List<String> keyPrefixes,[Function responseFactory = null]);
 }
 
-
-class _Regression551ProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _Regression551ProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _Regression551ProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _Regression551ProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _Regression551ProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _Regression551ServiceDescription();
 
   String get serviceName => Regression551.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _regression551MethodGetName:
         var r = Regression551GetResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
         Completer c = completerMap[message.header.requestId];
@@ skipping 16 matching lines @@
     }
   }
 
   @override
   String toString() {
     var superString = super.toString();
     return "_Regression551ProxyControl($superString)";
   }
 }
 
-
-class Regression551Proxy extends bindings.Proxy
-                              implements Regression551 {
+class Regression551Proxy
+    extends bindings.Proxy
+    implements Regression551 {
   Regression551Proxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _Regression551ProxyControl.fromEndpoint(endpoint));
 
   Regression551Proxy.fromHandle(core.MojoHandle handle)
       : super(new _Regression551ProxyControl.fromHandle(handle));
 
   Regression551Proxy.unbound()
       : super(new _Regression551ProxyControl.unbound());
 
@@ skipping 15 matching lines @@
     var params = new _Regression551GetParams();
     params.keyPrefixes = keyPrefixes;
     return ctrl.sendMessageWithRequestId(
         params,
         _regression551MethodGetName,
         -1,
         bindings.MessageHeader.kMessageExpectsResponse);
   }
 }
 
-
-class Regression551Stub extends bindings.Stub {
+class _Regression551StubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<Regression551> {
   Regression551 _impl;
 
-  Regression551Stub.fromEndpoint(
+  _Regression551StubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [Regression551 impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  Regression551Stub.fromHandle(
+  _Regression551StubControl.fromHandle(
       core.MojoHandle handle, [Regression551 impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  Regression551Stub.unbound([this._impl]) : super.unbound();
-
-  static Regression551Stub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For Regression551Stub"));
-    return new Regression551Stub.fromEndpoint(endpoint);
-  }
+  _Regression551StubControl.unbound([this._impl]) : super.unbound();
 
 
   Regression551GetResponseParams _regression551GetResponseParamsFactory(int result) {
     var result = new Regression551GetResponseParams();
     result.result = result;
     return result;
   }
 
   dynamic handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
@@ skipping 46 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "Regression551Stub($superString)";
+    return "_Regression551StubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _Regression551ServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class Regression551Stub
+    extends bindings.Stub<Regression551>
+    implements Regression551 {
+  Regression551Stub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [Regression551 impl])
+      : super(new _Regression551StubControl.fromEndpoint(endpoint, impl));
+
+  Regression551Stub.fromHandle(
+      core.MojoHandle handle, [Regression551 impl])
+      : super(new _Regression551StubControl.fromHandle(handle, impl));
+
+  Regression551Stub.unbound([Regression551 impl])
+      : super(new _Regression551StubControl.unbound(impl));
+
+  static Regression551Stub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For Regression551Stub"));
+    return new Regression551Stub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _Regression551StubControl.serviceDescription;
+
+
+  dynamic get(List<String> keyPrefixes,[Function responseFactory = null]) {
+    return impl.get(keyPrefixes,responseFactory);
+  }
+}
+
 const int _serviceNameMethodServiceNameName = 0;
 
 class _ServiceNameServiceDescription implements service_describer.ServiceDescription {
   dynamic getTopLevelInterface([Function responseFactory]) =>
       responseFactory(null);
 
   dynamic getTypeDefinition(String typeKey, [Function responseFactory]) =>
       responseFactory(null);
 
   dynamic getAllTypeDefinitions([Function responseFactory]) =>
       responseFactory(null);
 }
 
 abstract class ServiceName {
   static const String serviceName = null;
   dynamic serviceName_([Function responseFactory = null]);
 }
 
-
-class _ServiceNameProxyControl extends bindings.ProxyMessageHandler
-                                      implements bindings.ProxyControl {
+class _ServiceNameProxyControl
+    extends bindings.ProxyMessageHandler
+    implements bindings.ProxyControl {
   _ServiceNameProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
   _ServiceNameProxyControl.fromHandle(
       core.MojoHandle handle) : super.fromHandle(handle);
 
   _ServiceNameProxyControl.unbound() : super.unbound();
 
   service_describer.ServiceDescription get serviceDescription =>
       new _ServiceNameServiceDescription();
 
   String get serviceName => ServiceName.serviceName;
 
-  @override
   void handleResponse(bindings.ServiceMessage message) {
     switch (message.header.type) {
       case _serviceNameMethodServiceNameName:
         var r = ServiceNameServiceNameResponseParams.deserialize(
             message.payload);
         if (!message.header.hasRequestId) {
           proxyError("Expected a message with a valid request Id.");
           return;
         }
         Completer c = completerMap[message.header.requestId];
@@ skipping 16 matching lines @@
     }
   }
 
   @override
   String toString() {
     var superString = super.toString();
     return "_ServiceNameProxyControl($superString)";
   }
 }
 
-
-class ServiceNameProxy extends bindings.Proxy
-                              implements ServiceName {
+class ServiceNameProxy
+    extends bindings.Proxy
+    implements ServiceName {
   ServiceNameProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _ServiceNameProxyControl.fromEndpoint(endpoint));
 
   ServiceNameProxy.fromHandle(core.MojoHandle handle)
       : super(new _ServiceNameProxyControl.fromHandle(handle));
 
   ServiceNameProxy.unbound()
       : super(new _ServiceNameProxyControl.unbound());
 
@@ skipping 14 matching lines @@
   dynamic serviceName_([Function responseFactory = null]) {
     var params = new _ServiceNameServiceNameParams();
     return ctrl.sendMessageWithRequestId(
         params,
         _serviceNameMethodServiceNameName,
         -1,
         bindings.MessageHeader.kMessageExpectsResponse);
   }
 }
 
-
-class ServiceNameStub extends bindings.Stub {
+class _ServiceNameStubControl
+    extends bindings.StubMessageHandler
+    implements bindings.StubControl<ServiceName> {
   ServiceName _impl;
 
-  ServiceNameStub.fromEndpoint(
+  _ServiceNameStubControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [ServiceName impl])
       : super.fromEndpoint(endpoint, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  ServiceNameStub.fromHandle(
+  _ServiceNameStubControl.fromHandle(
       core.MojoHandle handle, [ServiceName impl])
       : super.fromHandle(handle, autoBegin: impl != null) {
     _impl = impl;
   }
 
-  ServiceNameStub.unbound([this._impl]) : super.unbound();
-
-  static ServiceNameStub newFromEndpoint(
-      core.MojoMessagePipeEndpoint endpoint) {
-    assert(endpoint.setDescription("For ServiceNameStub"));
-    return new ServiceNameStub.fromEndpoint(endpoint);
-  }
+  _ServiceNameStubControl.unbound([this._impl]) : super.unbound();
 
 
   ServiceNameServiceNameResponseParams _serviceNameServiceNameResponseParamsFactory(String serviceName_) {
     var result = new ServiceNameServiceNameResponseParams();
     result.serviceName_ = serviceName_;
     return result;
   }
 
   dynamic handleMessage(bindings.ServiceMessage message) {
     if (bindings.ControlMessageHandler.isControlMessage(message)) {
@@ skipping 44 matching lines @@
   }
 
   @override
   void bind(core.MojoMessagePipeEndpoint endpoint) {
     super.bind(endpoint);
     if (!isOpen && (_impl != null)) {
       beginHandlingEvents();
     }
   }
 
+  @override
   String toString() {
     var superString = super.toString();
-    return "ServiceNameStub($superString)";
+    return "_ServiceNameStubControl($superString)";
   }
 
   int get version => 0;
 
   static service_describer.ServiceDescription _cachedServiceDescription;
   static service_describer.ServiceDescription get serviceDescription {
     if (_cachedServiceDescription == null) {
       _cachedServiceDescription = new _ServiceNameServiceDescription();
     }
     return _cachedServiceDescription;
   }
 }
 
+class ServiceNameStub
+    extends bindings.Stub<ServiceName>
+    implements ServiceName {
+  ServiceNameStub.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint, [ServiceName impl])
+      : super(new _ServiceNameStubControl.fromEndpoint(endpoint, impl));
+
+  ServiceNameStub.fromHandle(
+      core.MojoHandle handle, [ServiceName impl])
+      : super(new _ServiceNameStubControl.fromHandle(handle, impl));
+
+  ServiceNameStub.unbound([ServiceName impl])
+      : super(new _ServiceNameStubControl.unbound(impl));
+
+  static ServiceNameStub newFromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint) {
+    assert(endpoint.setDescription("For ServiceNameStub"));
+    return new ServiceNameStub.fromEndpoint(endpoint);
+  }
+
+  static service_describer.ServiceDescription get serviceDescription =>
+      _ServiceNameStubControl.serviceDescription;
+
+
+  dynamic serviceName_([Function responseFactory = null]) {
+    return impl.serviceName_(responseFactory);
+  }
+}
+
 
 mojom_types.RuntimeTypeInfo getRuntimeTypeInfo() => _runtimeTypeInfo ??
     _initRuntimeTypeInfo();
 
 Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
   return getRuntimeTypeInfo().typeMap;
 }
 
 var _runtimeTypeInfo;
 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 = "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";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);
   var unzippedBytes = new ZLibDecoder().convert(bytes);
   var bdata = new ByteData.view(unzippedBytes.buffer);
   var message = new bindings.Message(bdata, null, unzippedBytes.length, 0);
   _runtimeTypeInfo = mojom_types.RuntimeTypeInfo.deserialize(message);
   return _runtimeTypeInfo;
 }