Remove Client relationship between mojo.Shell/mojo.Application

mojo/public/cpp/application/lib/application_impl.cc

 // 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.
 
 #include "mojo/public/cpp/application/application_impl.h"
 
 #include "mojo/public/cpp/application/application_delegate.h"
 #include "mojo/public/cpp/application/lib/service_registry.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/environment/logging.h"
 
 namespace mojo {
 
 class ApplicationImpl::ShellPtrWatcher : public ErrorHandler {
  public:
   ShellPtrWatcher(ApplicationImpl* impl) : impl_(impl) {}
 
   ~ShellPtrWatcher() override {}
 
   void OnConnectionError() override { impl_->OnShellError(); }
 
  private:
   ApplicationImpl* impl_;
   MOJO_DISALLOW_COPY_AND_ASSIGN(ShellPtrWatcher);
 };
 
-ApplicationImpl::ApplicationImpl(ApplicationDelegate* delegate, ShellPtr shell)
+ApplicationImpl::ApplicationImpl(ApplicationDelegate* delegate,
+                                 InterfaceRequest<Application> request)
     : initialized_(false),
       delegate_(delegate),
-      shell_(shell.Pass()),
-      shell_watch_(new ShellPtrWatcher(this)) {
-  shell_.set_client(this);
-  shell_.set_error_handler(shell_watch_);
+      binding_(this, request.Pass()),
+      shell_watch_(nullptr) {
 }
 
 bool ApplicationImpl::HasArg(const std::string& arg) const {
   return std::find(args_.begin(), args_.end(), arg) != args_.end();
 }
 
 void ApplicationImpl::ClearConnections() {
   for (ServiceRegistryList::iterator i(incoming_service_registries_.begin());
        i != incoming_service_registries_.end();
        ++i)
     delete *i;
   for (ServiceRegistryList::iterator i(outgoing_service_registries_.begin());
        i != outgoing_service_registries_.end();
        ++i)
     delete *i;
   incoming_service_registries_.clear();
   outgoing_service_registries_.clear();
 }
 
 ApplicationImpl::~ApplicationImpl() {
   ClearConnections();
   delete shell_watch_;
 }
 
 ApplicationConnection* ApplicationImpl::ConnectToApplication(
     const String& application_url) {
-  MOJO_CHECK(initialized_);
+  MOJO_CHECK(shell_);
   ServiceProviderPtr local_services;
   InterfaceRequest<ServiceProvider> local_request = GetProxy(&local_services);
   ServiceProviderPtr remote_services;
   shell_->ConnectToApplication(application_url, GetProxy(&remote_services),
                                local_services.Pass());
   internal::ServiceRegistry* registry = new internal::ServiceRegistry(
       this, application_url, remote_services.Pass(), local_request.Pass());
   if (!delegate_->ConfigureOutgoingConnection(registry)) {
     delete registry;
     return nullptr;
   }
   outgoing_service_registries_.push_back(registry);
   return registry;
 }
 
-ShellPtr ApplicationImpl::UnbindShell() {
-  MOJO_CHECK(shell_);
-  ShellPtr unbound_shell;
-  unbound_shell.Bind(shell_.PassMessagePipe());
-  return unbound_shell.Pass();
+void ApplicationImpl::Initialize(ShellPtr shell, Array<String> args) {
+  shell_ = shell.Pass();
+  shell_watch_ = new ShellPtrWatcher(this);
+  shell_.set_error_handler(shell_watch_);
+  args_ = args.To<std::vector<std::string>>();
+  delegate_->Initialize(this);
 }
 
-void ApplicationImpl::Initialize(Array<String> args) {
-  MOJO_CHECK(!initialized_);
-  initialized_ = true;
-  args_ = args.To<std::vector<std::string>>();
-  delegate_->Initialize(this);
+void ApplicationImpl::WaitForInitialize() {
+  if (!shell_)
+    binding_.WaitForIncomingMethodCall();
+}
+
+void ApplicationImpl::UnbindConnections(
+    InterfaceRequest<Application>* application_request,
+    ShellPtr* shell) {
+  *application_request = binding_.Unbind();
+  shell->Bind(shell_.PassMessagePipe());
 }
 
 void ApplicationImpl::AcceptConnection(
     const String& requestor_url,
     InterfaceRequest<ServiceProvider> services,
     ServiceProviderPtr exposed_services) {
   internal::ServiceRegistry* registry = new internal::ServiceRegistry(
       this, requestor_url, exposed_services.Pass(), services.Pass());
   if (!delegate_->ConfigureIncomingConnection(registry)) {
     delete registry;
     return;
   }
   incoming_service_registries_.push_back(registry);
 }
 
 void ApplicationImpl::RequestQuit() {
   Terminate();
 }
 
 }  // namespace mojo