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

mojo/shell/runner/child/runner_connection.cc

Index: mojo/shell/runner/child/runner_connection.cc
diff --git a/mojo/shell/runner/child/runner_connection.cc b/mojo/shell/runner/child/runner_connection.cc
index b8477ac6d2015fab6ba8caad67238afe21e56ae0..75b4648dc0db58f70f7753fe65959533d4e84baa 100644
--- a/mojo/shell/runner/child/runner_connection.cc
+++ b/mojo/shell/runner/child/runner_connection.cc
@@ -72,7 +72,7 @@ class Blocker {
 };
 
 using GotApplicationRequestCallback =
-    base::Callback<void(InterfaceRequest<mojom::Application>)>;
+    base::Callback<void(InterfaceRequest<mojom::ShellClient>)>;
 
 void OnCreateMessagePipe(ScopedMessagePipeHandle* result,
                          Blocker::Unblocker unblocker,
@@ -81,8 +81,8 @@ void OnCreateMessagePipe(ScopedMessagePipeHandle* result,
   unblocker.Unblock(base::Bind(&base::DoNothing));
 }
 
-void OnGotApplicationRequest(InterfaceRequest<mojom::Application>* out_request,
-                             InterfaceRequest<mojom::Application> request) {
+void OnGotApplicationRequest(InterfaceRequest<mojom::ShellClient>* out_request,
+                             InterfaceRequest<mojom::ShellClient> request) {
   *out_request = std::move(request);
 }
 
@@ -102,7 +102,7 @@ class RunnerConnectionImpl : public RunnerConnection {
 
   // Returns true if a connection to the runner has been established and
   // |request| has been modified, false if no connection was established.
-  bool WaitForApplicationRequest(InterfaceRequest<mojom::Application>* request,
+  bool WaitForApplicationRequest(InterfaceRequest<mojom::ShellClient>* request,
                                  ScopedMessagePipeHandle handle);
 
   ChildControllerImpl* controller() const { return controller_.get(); }
@@ -173,14 +173,14 @@ class ChildControllerImpl : public mojom::ChildController {
   }
 
   // |mojom::ChildController| methods:
-  void StartApp(InterfaceRequest<mojom::Application> application_request,
+  void StartApp(InterfaceRequest<mojom::ShellClient> request,
                 const StartAppCallback& on_app_complete) override {
     DCHECK(thread_checker_.CalledOnValidThread());
 
     on_app_complete_ = on_app_complete;
     unblocker_.Unblock(
         base::Bind(&ChildControllerImpl::ReturnApplicationRequestOnMainThread,
-                   callback_, base::Passed(&application_request)));
+                   callback_, base::Passed(&request)));
   }
 
   void ExitNow(int32_t exit_code) override {
@@ -199,8 +199,8 @@ class ChildControllerImpl : public mojom::ChildController {
 
   static void ReturnApplicationRequestOnMainThread(
       const GotApplicationRequestCallback& callback,
-      InterfaceRequest<mojom::Application> application_request) {
-    callback.Run(std::move(application_request));
+      InterfaceRequest<mojom::ShellClient> request) {
+    callback.Run(std::move(request));
   }
 
   base::ThreadChecker thread_checker_;
@@ -215,7 +215,7 @@ class ChildControllerImpl : public mojom::ChildController {
 };
 
 bool RunnerConnectionImpl::WaitForApplicationRequest(
-    InterfaceRequest<mojom::Application>* request,
+    InterfaceRequest<mojom::ShellClient>* request,
     ScopedMessagePipeHandle handle) {
   // If a valid message pipe to the runner was not provided, look for one on the
   // command line.
@@ -255,7 +255,7 @@ RunnerConnection::~RunnerConnection() {}
 
 // static
 RunnerConnection* RunnerConnection::ConnectToRunner(
-    InterfaceRequest<mojom::Application>* request,
+    InterfaceRequest<mojom::ShellClient>* request,
     ScopedMessagePipeHandle handle) {
   RunnerConnectionImpl* connection = new RunnerConnectionImpl;
   if (!connection->WaitForApplicationRequest(request, std::move(handle))) {