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

content/common/mojo/mojo_shell_connection_impl.cc

Index: content/common/mojo/mojo_shell_connection_impl.cc
diff --git a/content/common/mojo/mojo_shell_connection_impl.cc b/content/common/mojo/mojo_shell_connection_impl.cc
index 36004514c2c630b4ea75c93dee905b2fff543862..79256c85f47e548430a272524bade045a80c80e0 100644
--- a/content/common/mojo/mojo_shell_connection_impl.cc
+++ b/content/common/mojo/mojo_shell_connection_impl.cc
@@ -11,8 +11,8 @@
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
 #include "mojo/converters/network/network_type_converters.h"
-#include "mojo/shell/public/cpp/application_impl.h"
 #include "mojo/shell/public/cpp/shell_client.h"
+#include "mojo/shell/public/cpp/shell_connection.h"
 #include "mojo/shell/runner/child/runner_connection.h"
 
 namespace content {
@@ -64,12 +64,11 @@ MojoShellConnectionImpl::~MojoShellConnectionImpl() {
 
 void MojoShellConnectionImpl::WaitForShell(
     mojo::ScopedMessagePipeHandle handle) {
-  mojo::ApplicationRequest application_request;
+  mojo::ShellClientRequest request;
   runner_connection_.reset(mojo::shell::RunnerConnection::ConnectToRunner(
-      &application_request, std::move(handle)));
-  application_impl_.reset(
-      new mojo::ApplicationImpl(this, std::move(application_request)));
-  application_impl_->WaitForInitialize();
+      &request, std::move(handle)));
+  shell_connection_.reset(new mojo::ShellConnection(this, std::move(request)));
+  shell_connection_->WaitForInitialize();
 }
 
 void MojoShellConnectionImpl::Initialize(mojo::Shell* shell,
@@ -87,7 +86,7 @@ bool MojoShellConnectionImpl::AcceptConnection(mojo::Connection* connection) {
 
 mojo::Shell* MojoShellConnectionImpl::GetShell() {
   DCHECK(initialized_);
-  return application_impl_.get();
+  return shell_connection_.get();
 }
 
 void MojoShellConnectionImpl::AddListener(Listener* listener) {