Eliminate ShellClientFactoryConnection & just have the ApplicationManager do it.

mojo/shell/application_manager.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/shell/application_manager.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/process/process.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/trace_event/trace_event.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/services/package_manager/loader.h"
 #include "mojo/shell/application_instance.h"
 #include "mojo/shell/connect_util.h"
 #include "mojo/shell/public/cpp/connect.h"
 #include "mojo/shell/shell_application_loader.h"
-#include "mojo/shell/shell_client_factory_connection.h"
 #include "mojo/shell/switches.h"
 #include "mojo/util/filename_util.h"
 
 namespace mojo {
 namespace shell {
 
 namespace {
 
 // Used by TestAPI.
 bool has_created_instance = false;
 
-void OnEmptyOnConnectCallback(uint32_t remote_id,
-                              uint32_t shell_client_factory_id) {
+void OnEmptyOnConnectCallback(uint32_t remote_id) {
 }
 
 }  // namespace
 
 // static
 ApplicationManager::TestAPI::TestAPI(ApplicationManager* manager)
     : manager_(manager) {
 }
 
 ApplicationManager::TestAPI::~TestAPI() {
@@ skipping 20 matching lines @@
     : task_runner_(task_runner),
       native_runner_factory_(std::move(native_runner_factory)),
       weak_ptr_factory_(this) {
   SetLoaderForURL(make_scoped_ptr(new ShellApplicationLoader(this)),
                   GURL("mojo://shell/"));
 
   GURL package_manager_url("mojo://package_manager/");
   SetLoaderForURL(make_scoped_ptr(new package_manager::Loader(
       task_runner_, register_mojo_url_schemes)), package_manager_url);
 
-  ConnectToInterface(this, package_manager_url, &shell_resolver_);
+  ConnectToInterface(this, CreateShellIdentity(), package_manager_url,
+                     &shell_resolver_);
 }
 
 ApplicationManager::~ApplicationManager() {
   TerminateShellConnections();
   STLDeleteValues(&url_to_loader_);
   for (auto& runner : native_runners_)
     runner.reset();
 }
 
 void ApplicationManager::TerminateShellConnections() {
@@ skipping 121 matching lines @@
 
 ApplicationInstance* ApplicationManager::CreateInstance(
     const Identity& target_id,
     const mojom::Shell::ConnectToApplicationCallback& connect_callback,
     const base::Closure& on_application_end,
     const String& application_name,
     mojom::ShellClientRequest* request) {
   mojom::ShellClientPtr shell_client;
   *request = GetProxy(&shell_client);
   ApplicationInstance* instance = new ApplicationInstance(
-      std::move(shell_client), this, target_id,
-      mojom::Shell::kInvalidApplicationID, connect_callback,on_application_end,
-      application_name);
+      std::move(shell_client), this, target_id, connect_callback,
+      on_application_end, application_name);
   DCHECK(identity_to_instance_.find(target_id) ==
          identity_to_instance_.end());
   identity_to_instance_[target_id] = instance;
   mojom::ApplicationInfoPtr application_info =
       CreateApplicationInfoForInstance(instance);
   listeners_.ForAllPtrs(
       [this, &application_info](mojom::ApplicationManagerListener* listener) {
         listener->ApplicationInstanceCreated(application_info.Clone());
       });
   instance->InitializeApplication();
   return instance;
 }
 
-uint32_t ApplicationManager::StartShellClientFactory(
+void ApplicationManager::CreateShellClient(
     const Identity& source,
     const Identity& shell_client_factory,
     const GURL& url,
     mojom::ShellClientRequest request) {
-  ShellClientFactoryConnection* connection =
+  mojom::ShellClientFactory* factory =
       GetShellClientFactory(shell_client_factory, source);
-  connection->CreateShellClient(std::move(request), url);
-  return connection->id();
+  factory->CreateShellClient(std::move(request), url.spec());
 }
 
-ShellClientFactoryConnection* ApplicationManager::GetShellClientFactory(
+mojom::ShellClientFactory* ApplicationManager::GetShellClientFactory(
     const Identity& shell_client_factory_identity,
     const Identity& source_identity) {
-  auto it = identity_to_shell_client_factory_.find(
-      shell_client_factory_identity);
-  if (it != identity_to_shell_client_factory_.end())
-    return it->second;
+  auto it = shell_client_factories_.find(shell_client_factory_identity);
+  if (it != shell_client_factories_.end())
+    return it->second.get();
 
-  ShellClientFactoryConnection* connection = new ShellClientFactoryConnection(
-      this, source_identity,
-      shell_client_factory_identity,
-      ++shell_client_factory_id_counter_,
-      base::Bind(&ApplicationManager::OnShellClientFactoryConnectionClosed,
-                 weak_ptr_factory_.GetWeakPtr()));
-  identity_to_shell_client_factory_[shell_client_factory_identity] = connection;
-  return connection;
+  mojom::ShellClientFactoryPtr factory;
+  // TODO(beng): we should forward the original source identity!
+  ConnectToInterface(this, source_identity, shell_client_factory_identity.url(),
+                     &factory);
+  mojom::ShellClientFactory* factory_interface = factory.get();
+  factory.set_connection_error_handler(
+      base::Bind(&ApplicationManager::OnShellClientFactoryLost,
+                 weak_ptr_factory_.GetWeakPtr(),
+                 shell_client_factory_identity));
+  shell_client_factories_[shell_client_factory_identity] = std::move(factory);
+  return factory_interface;
 }
 
-void ApplicationManager::OnShellClientFactoryConnectionClosed(
-    ShellClientFactoryConnection* connection) {
+void ApplicationManager::OnShellClientFactoryLost(const Identity& which) {
   // Remove the mapping.
-  auto it = identity_to_shell_client_factory_.find(connection->identity());
-  DCHECK(it != identity_to_shell_client_factory_.end());
-  identity_to_shell_client_factory_.erase(it);
+  auto it = shell_client_factories_.find(which);
+  DCHECK(it != shell_client_factories_.end());
+  shell_client_factories_.erase(it);
 }
 
 void ApplicationManager::OnGotResolvedURL(
     scoped_ptr<ConnectToApplicationParams> params,
     const String& resolved_url,
     const String& file_url,
     const String& application_name,
     mojom::CapabilityFilterPtr base_filter) {
   // It's possible that when this manifest request was issued, another one was
   // already in-progress and completed by the time this one did, and so the
   // requested application may already be running.
   if (ConnectToRunningApplication(&params))
     return;
 
   GURL resolved_gurl = resolved_url.To<GURL>();
   if (params->target().url().spec() != resolved_url) {
     CapabilityFilter capability_filter = GetPermissiveCapabilityFilter();
     if (!base_filter.is_null())
       capability_filter = base_filter->filter.To<CapabilityFilter>();
 
     // TODO(beng): For now, we just use the legacy PackageManagerImpl to manage
     //             the ShellClientFactory connection. Once we get rid of the
     //             non-remote package manager path we will have to fold this in
     //             here.
     Identity source, target;
     mojom::ShellClientRequest request;
     ApplicationInstance* instance = CreateAndConnectToInstance(
         std::move(params), &source, &target, application_name, &request);
-
-    uint32_t shell_client_factory_id = StartShellClientFactory(
-        source, Identity(resolved_gurl, target.qualifier(), capability_filter),
-        target.url(), std::move(request));
-    CHECK(shell_client_factory_id != mojom::Shell::kInvalidApplicationID);
-    instance->set_requesting_shell_client_factory_id(shell_client_factory_id);
+    CreateShellClient(source, Identity(resolved_gurl, target.qualifier(),
+                      capability_filter), target.url(), std::move(request));
     instance->RunConnectCallback();
     return;
   }
   CreateAndRunLocalApplication(std::move(params), application_name,
                                file_url.To<GURL>());
 }
 
 void ApplicationManager::CreateAndRunLocalApplication(
     scoped_ptr<ConnectToApplicationParams> params,
     const String& application_name,
@@ skipping 84 matching lines @@
     }
   }
 }
 
 mojom::Shell::ConnectToApplicationCallback EmptyConnectCallback() {
   return base::Bind(&OnEmptyOnConnectCallback);
 }
 
 }  // namespace shell
 }  // namespace mojo