Remove Client relationship between mojo.Shell/mojo.Application

mojo/public/cpp/application/application_impl.h

 // 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.
 
 #ifndef MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_
 #define MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_
 #include <vector>
 
 #include "mojo/public/cpp/application/application_connection.h"
 #include "mojo/public/cpp/application/lib/service_connector.h"
@@ skipping 32 matching lines @@
 //
 // Create an ApplicationImpl instance that collects any service implementations.
 //
 // ApplicationImpl app(service_provider_handle);
 // app.AddService<FooImpl>();
 //
 // BarContext context;
 // app.AddService<BarImpl>(&context);
 //
 //
-class ApplicationImpl : public InterfaceImpl<Application> {
+class ApplicationImpl : public Application {
  public:
-  ApplicationImpl(ApplicationDelegate* delegate, ShellPtr shell);
+  ApplicationImpl(ApplicationDelegate* delegate,
+                  InterfaceRequest<Application> request);
   ~ApplicationImpl() override;
 
   Shell* shell() const { return shell_.get(); }
 
   // Returns any initial configuration arguments, passed by the Shell.
   const std::vector<std::string>& args() const { return args_; }
   bool HasArg(const std::string& arg) const;
 
   // Establishes a new connection to an application. Caller does not own.
   ApplicationConnection* ConnectToApplication(const String& application_url);
 
   // Connect to application identified by |application_url| and connect to the
   // service implementation of the interface identified by |Interface|.
   template <typename Interface>
   void ConnectToService(const std::string& application_url,
                         InterfacePtr<Interface>* ptr) {
     ConnectToApplication(application_url)->ConnectToService(ptr);
   }
 
-  // Unbind the shell from this application and return its handle.
-  ShellPtr UnbindShell();
+  // Application implementation.
+  void Initialize(ShellPtr shell, Array<String> args) override;
 
-  // Application implementation.
-  void Initialize(Array<String> args) override;
+  // Block until the Application is initialized, if it is not already.
+  void WaitForInitialize();
+
+  // Unbinds the Shell and Application connections. Must be called after
+  // Initialize.

[DaveMoore, 2015/01/27 00:41:29]

Nit: This seems very specific to our test infrastructure. Are there other
reasons an app would do this? Perhaps more doc.

[jamesr, 2015/01/27 00:59:04]

You could do this if you wanted to bind to another thread, for instance (since
our bindings associate you with the current thread's message loop).  I can try
to add some more documentation.

+  void UnbindConnections(InterfaceRequest<Application>* application_request,
+                         ShellPtr* shell);
 
   // Quits the main run loop for this application.
   static void Terminate();
 
  private:
   class ShellPtrWatcher;
 
   void ClearConnections();
 
   void OnShellError() {
     ClearConnections();
     Terminate();
   }
 
   // Application implementation.
   void AcceptConnection(const String& requestor_url,
                         InterfaceRequest<ServiceProvider> services,
                         ServiceProviderPtr exposed_services) override;
   void RequestQuit() override;
 
   typedef std::vector<internal::ServiceRegistry*> ServiceRegistryList;
 
   bool initialized_;

[DaveMoore, 2015/01/27 00:41:29]

Nit: Can't initialized_ go away now?

[jamesr, 2015/01/27 00:59:04]

Ah right, yes.  It's redundant with shell_ now.

   ServiceRegistryList incoming_service_registries_;
   ServiceRegistryList outgoing_service_registries_;
   ApplicationDelegate* delegate_;
+  Binding<Application> binding_;
   ShellPtr shell_;
   ShellPtrWatcher* shell_watch_;
   std::vector<std::string> args_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_APPLICATION_APPLICATION_IMPL_H_