Eliminate ShellClientFactoryConnection & just have the ApplicationManager do it.

mojo/shell/application_manager.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_SHELL_APPLICATION_MANAGER_H_
 #define MOJO_SHELL_APPLICATION_MANAGER_H_
 
 #include <map>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/bindings/weak_interface_ptr_set.h"
 #include "mojo/services/package_manager/public/interfaces/shell_resolver.mojom.h"
 #include "mojo/shell/application_loader.h"
 #include "mojo/shell/capability_filter.h"
 #include "mojo/shell/connect_to_application_params.h"
 #include "mojo/shell/identity.h"
 #include "mojo/shell/native_runner.h"
 #include "mojo/shell/public/interfaces/application_manager.mojom.h"
 #include "mojo/shell/public/interfaces/interface_provider.mojom.h"
 #include "mojo/shell/public/interfaces/shell.mojom.h"
 #include "mojo/shell/public/interfaces/shell_client.mojom.h"
+#include "mojo/shell/public/interfaces/shell_client_factory.mojom.h"
 #include "url/gurl.h"
 
 namespace base {
 class FilePath;
 class SequencedWorkerPool;
 }
 
 namespace mojo {
 namespace shell {
 
@@ skipping 62 matching lines @@
       mojom::CapabilityFilterPtr filter,
       InterfaceRequest<mojom::PIDReceiver> pid_receiver);
   void AddListener(mojom::ApplicationManagerListenerPtr listener);
 
   void ApplicationPIDAvailable(uint32_t id, base::ProcessId pid);
 
  private:
   using IdentityToInstanceMap = std::map<Identity, ApplicationInstance*>;
   using URLToLoaderMap = std::map<GURL, ApplicationLoader*>;
   using IdentityToShellClientFactoryMap =
-      std::map<Identity, ShellClientFactoryConnection*>;
+      std::map<Identity, mojom::ShellClientFactoryPtr>;
 
   // Takes the contents of |params| only when it returns true.
   bool ConnectToRunningApplication(
       scoped_ptr<ConnectToApplicationParams>* params);
 
   ApplicationInstance* CreateAndConnectToInstance(
       scoped_ptr<ConnectToApplicationParams> params,
       Identity* source,
       Identity* target,
       const std::string& application_name,
       mojom::ShellClientRequest* request);
   ApplicationInstance* CreateInstance(
       const Identity& target_id,
       const mojom::Shell::ConnectToApplicationCallback& connect_callback,
       const base::Closure& on_application_end,
       const String& application_name,
       mojom::ShellClientRequest* request);
 
-  uint32_t StartShellClientFactory(const Identity& source,
-                                   const Identity& shell_client_factory,
-                                   const GURL& url,
-                                   mojom::ShellClientRequest request);
+  void CreateShellClient(const Identity& source,
+                         const Identity& shell_client_factory,
+                         const GURL& url,
+                         mojom::ShellClientRequest request);
   // Returns a running ShellClientFactory for |shell_client_factory_identity|,
   // if there is not one running one is started for |source_identity|.
-  ShellClientFactoryConnection* GetShellClientFactory(
+  mojom::ShellClientFactory* GetShellClientFactory(
       const Identity& shell_client_factory_identity,
       const Identity& source_identity);
-  void OnShellClientFactoryConnectionClosed(
-      ShellClientFactoryConnection* shell_client_factory);
+  void OnShellClientFactoryLost(const Identity& which);;
 
   // Callback when remote PackageManager resolves mojo:foo to mojo:bar.
   // |params| are the params passed to Connect().
   // |resolved_url| is the mojo: url identifying the physical package
   // application.
   // |file_url| is the resolved file:// URL of the physical package.
   // |application_name| is the requested application's pretty name, from its
   // manifest.
   // |base_filter| is the CapabilityFilter the requested application should be
   // run with, from its manifest.
@@ skipping 26 matching lines @@
 
   package_manager::mojom::ShellResolverPtr shell_resolver_;
 
   // Loader management.
   // Loaders are chosen in the order they are listed here.
   URLToLoaderMap url_to_loader_;
   scoped_ptr<ApplicationLoader> default_loader_;
 
   IdentityToInstanceMap identity_to_instance_;
 
-  IdentityToShellClientFactoryMap identity_to_shell_client_factory_;
+  IdentityToShellClientFactoryMap shell_client_factories_;
   // Counter used to assign ids to content handlers.
   uint32_t shell_client_factory_id_counter_;
 
   WeakInterfacePtrSet<mojom::ApplicationManagerListener> listeners_;
 
   base::TaskRunner* task_runner_;
   scoped_ptr<NativeRunnerFactory> native_runner_factory_;
   std::vector<scoped_ptr<NativeRunner>> native_runners_;
   base::WeakPtrFactory<ApplicationManager> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ApplicationManager);
 };
 
 mojom::Shell::ConnectToApplicationCallback EmptyConnectCallback();
 
 }  // namespace shell
 }  // namespace mojo
 
 #endif  // MOJO_SHELL_APPLICATION_MANAGER_H_