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

mojo/shell/runner/host/native_application_support.cc

Index: mojo/shell/runner/host/native_application_support.cc
diff --git a/mojo/shell/runner/host/native_application_support.cc b/mojo/shell/runner/host/native_application_support.cc
index eeccef913ee5987162f78479f8e836e9c6d9a93d..97288fa1e6ecc92d0ecb4d5b7bce276222f6d37e 100644
--- a/mojo/shell/runner/host/native_application_support.cc
+++ b/mojo/shell/runner/host/native_application_support.cc
@@ -54,7 +54,7 @@ base::NativeLibrary LoadNativeApplication(const base::FilePath& app_path) {
 
 bool RunNativeApplication(
     base::NativeLibrary app_library,
-    InterfaceRequest<mojom::Application> application_request) {
+    InterfaceRequest<mojom::ShellClient> request) {
   // Tolerate |app_library| being null, to make life easier for callers.
   if (!app_library)
     return false;
@@ -120,7 +120,7 @@ bool RunNativeApplication(
     return false;
   }
   // |MojoMain()| takes ownership of the service handle.
-  MojoHandle handle = application_request.PassMessagePipe().release().value();
+  MojoHandle handle = request.PassMessagePipe().release().value();
   MojoResult result = main_function(handle);
   if (result != MOJO_RESULT_OK) {
     LOG(ERROR) << "MojoMain returned error (result: " << result << ")";