Dart: Adjusts class Application for removal of Application/Shell Client=

mojo/public/dart/src/application.dart

Index: mojo/public/dart/src/application.dart
diff --git a/mojo/public/dart/src/application.dart b/mojo/public/dart/src/application.dart
index d950f78032e30396320abc06feb2ad39ca10950c..fcd22442c343ad6f6edb2723afdf15a4d9121d42 100644
--- a/mojo/public/dart/src/application.dart
+++ b/mojo/public/dart/src/application.dart
@@ -4,26 +4,75 @@
 
 part of application;
 
-// The Application interface doesn't explicitly have a Shell as a Client, but
-// that is what is at the other end of the MessagePipe.
-abstract class Application extends application.ApplicationStub
-                           with shell.ShellCalls {
+class ApplicationImpl implements application.ApplicationStub {
+  shell_mojom.ShellProxy shell;
+  Application _application;
+
+  ApplicationImpl(this._application);
+
+  void initialize(shell_mojom.ShellProxy shellProxy, List<String> args) {
+    assert(shell == null);
+    shell = shellProxy;
+    _application.initialize(args);
+  }
+
+  void acceptConnection(
+      String requestorUrl,
+      service_provider.ServiceProviderStub services,
+      service_provider.ServiceProviderProxy exposedServices) =>
+      _application._acceptConnection(requestorUrl, services, exposedServices);
+
+  void close() => shell.close();
+}
+
+// TODO(zra): Better documentation and examples.
+// To implement, provide a stubFactoryClosure() that returns a function
+// that takes a MojoMessagePipeEndpoint and returns a Stub that provides the
+// Application's services. The function may return null if the Application
+// provides no services. Optionally override initialize() when needed. Call
+// listen() on a newly created Application to begin providing services. Call
+// connectToService() to request services from the Shell. Calling close()
+// closes connections to any requested ServiceProviders and the Shell.
+abstract class Application {
+  application.ApplicationStub _applicationStub;
+  ApplicationImpl _applicationImpl;
   List<service_provider.ServiceProviderProxy> _proxies;
 
-  Application(core.MojoMessagePipeEndpoint endpoint) :
-      _proxies = [],
-      super(endpoint);
+  Application(core.MojoMessagePipeEndpoint endpoint) {
+    _proxies = [];
+    _applicationImpl = new ApplicationImpl(this);
+    _applicationStub = new application.ApplicationStub(endpoint)
+                       ..delegate = _applicationImpl;
+  }
 
-  Application.fromHandle(core.MojoHandle shellHandle) :
-      _proxies = [],
-      super.fromHandle(shellHandle);
+  Application.fromHandle(core.MojoHandle appHandle) {
+    _proxies = [];
+    _applicationImpl = new ApplicationImpl(this);
+    _applicationStub = new application.ApplicationStub.fromHandle(appHandle)
+                       ..delegate = _applicationImpl;
+  }
 
-  Function stubFactoryClosure() => (endpoint) => null;
+  Function stubFactoryClosure();
 
-  void initialize(List<String> args) {
+  void initialize(List<String> args) {}
+
+  void connectToService(String url, bindings.Proxy proxy) {
+    assert(!proxy.isBound);
+    var endpoint = _connectToServiceHelper(url, proxy.name);
+    proxy.bind(endpoint);
   }
 
-  void acceptConnection(
+  listen() => _applicationStub.listen();
+
+  void close() {
+    assert(_proxies != null);
+    assert(_applicationImpl != null);
+    _proxies.forEach((c) => c.close());
+    _proxies.clear();
+    _applicationImpl.close();
+  }
+
+  void _acceptConnection(
       String requestorUrl,
       service_provider.ServiceProviderStub services,
       service_provider.ServiceProviderProxy exposedServices) {
@@ -35,12 +84,6 @@ abstract class Application extends application.ApplicationStub
     }
   }
 
-  void connectToService(String url, bindings.Proxy proxy) {
-    assert(!proxy.isBound);
-    var endpoint = _connectToServiceHelper(url, proxy.name);
-    proxy.bind(endpoint);
-  }
-
   core.MojoMessagePipeEndpoint _connectToServiceHelper(
       String url, String service) {
     var applicationPipe = new core.MojoMessagePipe();
@@ -48,15 +91,10 @@ abstract class Application extends application.ApplicationStub
     var applicationEndpoint = applicationPipe.endpoints[1];
     var serviceProviderProxy =
         new service_provider.ServiceProviderProxy.unbound();
-    callConnectToApplication(url, serviceProviderProxy, null);
+    _applicationImpl.shell.callConnectToApplication(
+        url, serviceProviderProxy, null);
     serviceProviderProxy.callConnectToService(service, applicationEndpoint);
     _proxies.add(serviceProviderProxy);
     return proxyEndpoint;
   }
-
-  void close() {
-    _proxies.forEach((c) => c.close());
-    _proxies.clear();
-    super.close();
-  }
 }