Eliminate ShellClientFactoryConnection & just have the ApplicationManager do it.

mojo/shell/application_instance.cc

 // Copyright 2015 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_instance.h"
 
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/common/url_type_converters.h"
 #include "mojo/shell/application_manager.h"
 
 namespace mojo {
 namespace shell {
 
 ApplicationInstance::ApplicationInstance(
     mojom::ShellClientPtr shell_client,
     ApplicationManager* manager,
     const Identity& identity,
-    uint32_t requesting_shell_client_factory_id,
     const mojom::Shell::ConnectToApplicationCallback& connect_callback,
     const base::Closure& on_application_end,
     const String& application_name)
     : manager_(manager),
       id_(GenerateUniqueID()),
       identity_(identity),
       allow_any_application_(identity.filter().size() == 1 &&
                              identity.filter().count("*") == 1),
-      requesting_shell_client_factory_id_(requesting_shell_client_factory_id),
       connect_callback_(connect_callback),
       on_application_end_(on_application_end),
       shell_client_(std::move(shell_client)),
       binding_(this),
       pid_receiver_binding_(this),
       queue_requests_(false),
       native_runner_(nullptr),
       application_name_(application_name),
       pid_(base::kNullProcessId) {
   DCHECK_NE(Shell::kInvalidApplicationID, id_);
 }
 
 ApplicationInstance::~ApplicationInstance() {
-  for (auto request : queued_client_requests_) {
-    request->connect_callback().Run(kInvalidApplicationID,
-                                    kInvalidApplicationID);
-  }
+  for (auto request : queued_client_requests_)
+    request->connect_callback().Run(kInvalidApplicationID);
   STLDeleteElements(&queued_client_requests_);
 }
 
 void ApplicationInstance::InitializeApplication() {
   shell_client_->Initialize(binding_.CreateInterfacePtrAndBind(),
                             identity_.url().spec(), id_);
   binding_.set_connection_error_handler([this]() { OnConnectionError(); });
 }
 
 void ApplicationInstance::ConnectToClient(
@@ skipping 10 matching lines @@
   native_runner_ = native_runner;
 }
 
 void ApplicationInstance::BindPIDReceiver(
     InterfaceRequest<mojom::PIDReceiver> pid_receiver) {
   pid_receiver_binding_.Bind(std::move(pid_receiver));
 }
 
 void ApplicationInstance::RunConnectCallback() {
   if (!connect_callback_.is_null())
-    connect_callback_.Run(id_, requesting_shell_client_factory_id_);
+    connect_callback_.Run(id_);
 }
 
 // Shell implementation:
 void ApplicationInstance::ConnectToApplication(
     URLRequestPtr app_request,
     shell::mojom::InterfaceProviderRequest remote_interfaces,
     shell::mojom::InterfaceProviderPtr local_interfaces,
     mojom::CapabilityFilterPtr filter,
     const ConnectToApplicationCallback& callback) {
   std::string url_string = app_request->url.To<std::string>();
   GURL url(url_string);
   if (!url.is_valid()) {
     LOG(ERROR) << "Error: invalid URL: " << url_string;
-    callback.Run(kInvalidApplicationID, kInvalidApplicationID);
+    callback.Run(kInvalidApplicationID);
     return;
   }
   if (allow_any_application_ ||
       identity_.filter().find(url.spec()) != identity_.filter().end()) {
     CapabilityFilter capability_filter = GetPermissiveCapabilityFilter();
     if (!filter.is_null())
       capability_filter = filter->filter.To<CapabilityFilter>();
 
     scoped_ptr<ConnectToApplicationParams> params(
         new ConnectToApplicationParams);
     params->SetSource(this);
     GURL app_url(app_request->url.get());
     params->SetTargetURLRequest(
         std::move(app_request),
         Identity(app_url, std::string(), capability_filter));
     params->set_remote_interfaces(std::move(remote_interfaces));
     params->set_local_interfaces(std::move(local_interfaces));
     params->set_connect_callback(callback);
     manager_->ConnectToApplication(std::move(params));
   } else {
     LOG(WARNING) << "CapabilityFilter prevented connection from: " <<
         identity_.url() << " to: " << url.spec();
-    callback.Run(kInvalidApplicationID, kInvalidApplicationID);
+    callback.Run(kInvalidApplicationID);
   }
 }
 
 void ApplicationInstance::QuitApplication() {
   queue_requests_ = true;
   shell_client_->OnQuitRequested(
       base::Bind(&ApplicationInstance::OnQuitRequestedResult,
                  base::Unretained(this)));
 }
 
 void ApplicationInstance::SetPID(uint32_t pid) {
   // This will call us back to update pid_.
   manager_->ApplicationPIDAvailable(id_, pid);
 }
 
 uint32_t ApplicationInstance::GenerateUniqueID() const {
   static uint32_t id = Shell::kInvalidApplicationID;
   ++id;
   CHECK_NE(Shell::kInvalidApplicationID, id);
   return id;
 }
 
 void ApplicationInstance::CallAcceptConnection(
     scoped_ptr<ConnectToApplicationParams> params) {
-  params->connect_callback().Run(id_, requesting_shell_client_factory_id_);
+  params->connect_callback().Run(id_);
   AllowedInterfaces interfaces;
   interfaces.insert("*");
   if (!params->source().is_null())
     interfaces = GetAllowedInterfaces(params->source().filter(), identity_);
 
   ApplicationInstance* source =
       manager_->GetApplicationInstance(params->source());
   uint32_t source_id = source ? source->id() : Shell::kInvalidApplicationID;
   shell_client_->AcceptConnection(
       params->source().url().spec(), source_id, params->TakeRemoteInterfaces(),
@@ skipping 44 matching lines @@
 
   queue_requests_ = false;
   for (auto request : queued_client_requests_)
     CallAcceptConnection(make_scoped_ptr(request));
 
   queued_client_requests_.clear();
 }
 
 }  // namespace shell
 }  // namespace mojo