ApplicationImpl->ShellConnection, mojom::Application->mojom::ShellClient

mojo/shell/application_instance.cc

Index: mojo/shell/application_instance.cc
diff --git a/mojo/shell/application_instance.cc b/mojo/shell/application_instance.cc
index 7d9abdf3d9d4e9deaf1d96fb302ad56f0228b764..d09e1423349c76e5413494474f87450579227fe0 100644
--- a/mojo/shell/application_instance.cc
+++ b/mojo/shell/application_instance.cc
@@ -20,7 +20,7 @@ namespace mojo {
 namespace shell {
 
 ApplicationInstance::ApplicationInstance(
-    mojom::ApplicationPtr application,
+    mojom::ShellClientPtr shell_client,
     ApplicationManager* manager,
     const Identity& identity,
     uint32_t requesting_content_handler_id,
@@ -32,7 +32,7 @@ ApplicationInstance::ApplicationInstance(
                              identity.filter().count("*") == 1),
       requesting_content_handler_id_(requesting_content_handler_id),
       on_application_end_(on_application_end),
-      application_(std::move(application)),
+      shell_client_(std::move(shell_client)),
       binding_(this),
       pid_receiver_binding_(this),
       queue_requests_(false),
@@ -50,8 +50,8 @@ ApplicationInstance::~ApplicationInstance() {
 }
 
 void ApplicationInstance::InitializeApplication() {
-  application_->Initialize(binding_.CreateInterfacePtrAndBind(),
-                           identity_.url().spec(), id_);
+  shell_client_->Initialize(binding_.CreateInterfacePtrAndBind(),
+                            identity_.url().spec(), id_);
   binding_.set_connection_error_handler([this]() { OnConnectionError(); });
 }
 
@@ -114,7 +114,7 @@ void ApplicationInstance::ConnectToApplication(
 
 void ApplicationInstance::QuitApplication() {
   queue_requests_ = true;
-  application_->OnQuitRequested(
+  shell_client_->OnQuitRequested(
       base::Bind(&ApplicationInstance::OnQuitRequestedResult,
                  base::Unretained(this)));
 }
@@ -142,7 +142,7 @@ void ApplicationInstance::CallAcceptConnection(
   ApplicationInstance* source =
       manager_->GetApplicationInstance(params->source());
   uint32_t source_id = source ? source->id() : Shell::kInvalidApplicationID;
-  application_->AcceptConnection(
+  shell_client_->AcceptConnection(
       params->source().url().spec(), source_id, params->TakeServices(),
       params->TakeExposedServices(), Array<String>::From(interfaces),
       params->target().url().spec());