ApplicationConnection lifetime management changes.

mojo/application/public/cpp/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_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
 #define MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_
 
 #include <vector>
 
+#include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/application/public/cpp/app_lifetime_helper.h"
 #include "mojo/application/public/cpp/application_connection.h"
 #include "mojo/application/public/cpp/application_delegate.h"
 #include "mojo/application/public/cpp/lib/service_registry.h"
 #include "mojo/application/public/interfaces/application.mojom.h"
 #include "mojo/application/public/interfaces/shell.mojom.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/system/core.h"
 
@@ skipping 51 matching lines @@
   // been invoked. It will remain valid until UnbindConnections() is invoked or
   // the ApplicationImpl is destroyed.
   Shell* shell() const { return shell_.get(); }
 
   const std::string& url() const { return url_; }
 
   AppLifetimeHelper* app_lifetime_helper() { return &app_lifetime_helper_; }
 
   // Requests a new connection to an application. Returns a pointer to the
   // connection if the connection is permitted by this application's delegate,
-  // or nullptr otherwise. Caller does not take ownership. The pointer remains
-  // valid until an error occurs on the connection with the Shell, until the
-  // ApplicationImpl is destroyed, or until the connection is closed through a
-  // call to ApplicationConnection::CloseConnection.
+  // or nullptr otherwise. Caller takes ownership.
   // TODO(beng): consider replacing default value in a separate CL per style
   //             guide.
-  ApplicationConnection* ConnectToApplication(
+  scoped_ptr<ApplicationConnection> ConnectToApplication(
       URLRequestPtr request,
       CapabilityFilterPtr filter = nullptr);
 
-  // Closes the |connection|.
-  void CloseConnection(ApplicationConnection* connection);
-
   // Connect to application identified by |request->url| and connect to the
   // service implementation of the interface identified by |Interface|.
   template <typename Interface>
   void ConnectToService(mojo::URLRequestPtr request,
                         InterfacePtr<Interface>* ptr) {
-    ApplicationConnection* connection = ConnectToApplication(request.Pass());
-    if (!connection)
+    scoped_ptr<ApplicationConnection> connection =
+        ConnectToApplication(request.Pass());
+    if (!connection.get())
       return;
     connection->ConnectToService(ptr);
   }
 
   // Application implementation.
   void Initialize(ShellPtr shell, const mojo::String& url) override;
 
   // Block until the Application is initialized, if it is not already.
   void WaitForInitialize();
 
@@ skipping 11 matching lines @@
   // Application implementation.
   void AcceptConnection(const String& requestor_url,
                         InterfaceRequest<ServiceProvider> services,
                         ServiceProviderPtr exposed_services,
                         Array<String> allowed_interfaces,
                         const String& url) override;
   void OnQuitRequested(const Callback<void(bool)>& callback) override;
 
   void OnConnectionError();
 
-  void ClearConnections();
-
   // Called from Quit() when there is no Shell connection, or asynchronously
   // from Quit() once the Shell has OK'ed shutdown.
   void QuitNow();
 
-  typedef std::vector<internal::ServiceRegistry*> ServiceRegistryList;
-
-  ServiceRegistryList incoming_service_registries_;
-  ServiceRegistryList outgoing_service_registries_;
+  // We track the lifetime of incoming connection registries as it more
+  // convenient for the client.
+  ScopedVector<ApplicationConnection> incoming_connections_;
   ApplicationDelegate* delegate_;
   Binding<Application> binding_;
   ShellPtr shell_;
   std::string url_;
   Closure termination_closure_;
   AppLifetimeHelper app_lifetime_helper_;
   bool quit_requested_;
-  bool in_destructor_;
   base::WeakPtrFactory<ApplicationImpl> weak_factory_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(ApplicationImpl);
 };
 
 }  // namespace mojo
 
 #endif  // MOJO_APPLICATION_PUBLIC_CPP_APPLICATION_IMPL_H_