Dart: Refactors Proxies

mojo/dart/packages/mojo/lib/src/application_connection.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.
 
 part of application;
 
 typedef void ServiceFactory(core.MojoMessagePipeEndpoint endpoint);
 typedef void FallbackServiceFactory(
     String interfaceName, core.MojoMessagePipeEndpoint endpoint);
 
 class LocalServiceProvider implements ServiceProvider {
   final ApplicationConnection connection;
   ServiceProviderStub _stub;
 
   LocalServiceProvider(this.connection, this._stub) {
     _stub.impl = this;
     if (!_stub.isOpen) {
       throw new core.MojoApiError("The service provider stub must be open");
     }
   }
 
   set onError(Function f) {
     _stub.onError = f;
   }
 
   Future close({bool immediate: false}) => _stub.close(immediate: immediate);
 
-  void connectToService(
+  void connectToService_(
       String interfaceName, core.MojoMessagePipeEndpoint pipe) {
     if (connection._nameToServiceFactory.containsKey(interfaceName)) {
       connection._nameToServiceFactory[interfaceName](pipe);
       return;
     }
     if (connection.fallbackServiceFactory != null) {
       connection.fallbackServiceFactory(interfaceName, pipe);
       return;
     }
     // The specified interface isn't provided. Close the pipe so the
@@ skipping 44 matching lines @@
 
   FallbackServiceFactory get fallbackServiceFactory => _fallbackServiceFactory;
   set fallbackServiceFactory(FallbackServiceFactory f) {
     if (_localServiceProvider == null) {
       throw new core.MojoApiError(
           "There must be a local service provider to set a service factory");
     }
     _fallbackServiceFactory = f;
   }
 
-  bindings.ProxyBase requestService(bindings.ProxyBase proxy,
+  bindings.Proxy requestService(bindings.Proxy proxy,
       [String serviceName]) {
-    if (proxy.impl.isBound ||
+    if (proxy.ctrl.isBound ||
         (remoteServiceProvider == null) ||
-        !remoteServiceProvider.impl.isBound) {
+        !remoteServiceProvider.ctrl.isBound) {
       throw new core.MojoApiError(
           "The proxy is bound, or there is no remove service provider proxy");
     }
 
-    var name = serviceName ?? proxy.serviceName;
+    var name = serviceName ?? proxy.ctrl.serviceName;
     if ((name == null) || name.isEmpty) {
       throw new core.MojoApiError(
           "If an interface has no ServiceName, then one must be provided.");
     }
 
     var pipe = new core.MojoMessagePipe();
-    proxy.impl.bind(pipe.endpoints[0]);
-    remoteServiceProvider.ptr.connectToService(name, pipe.endpoints[1]);
+    proxy.ctrl.bind(pipe.endpoints[0]);
+    remoteServiceProvider.connectToService_(name, pipe.endpoints[1]);
     return proxy;
   }
 
   /// Prepares this connection to provide the specified service when a call for
   /// the given [interfaceName] is received. The provided service can also
   /// choose to expose a service description.
   void provideService(String interfaceName, ServiceFactory factory,
       {service_describer.ServiceDescription description}) {
     if (_localServiceProvider == null) {
       throw new core.MojoApiError(
@@ skipping 39 matching lines @@
     }
     if (_localServiceProvider != null) {
       lspCloseFuture = _localServiceProvider.close(immediate: immediate);
       _localServiceProvider = null;
     } else {
       lspCloseFuture = new Future.value(null);
     }
     return rspCloseFuture.then((_) => lspCloseFuture);
   }
 }