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

mojo/shell/standalone/android/android_handler.cc

Index: mojo/shell/standalone/android/android_handler.cc
diff --git a/mojo/shell/standalone/android/android_handler.cc b/mojo/shell/standalone/android/android_handler.cc
index 98788243fae654f6e727c7bc24a695fe5e22a4a8..cb284c51982be0db2eed30150326aab4ac6b46c0 100644
--- a/mojo/shell/standalone/android/android_handler.cc
+++ b/mojo/shell/standalone/android/android_handler.cc
@@ -41,8 +41,8 @@ void RunAndroidApplication(JNIEnv* env,
                            jobject j_context,
                            const base::FilePath& app_path,
                            jint j_handle) {
-  InterfaceRequest<mojom::Application> application_request =
-      MakeRequest<mojom::Application>(
+  InterfaceRequest<mojom::ShellClient> request =
+      MakeRequest<mojom::ShellClient>(
           MakeScopedHandle(MessagePipeHandle(j_handle)));
 
   // Load the library, so that we can set the application context there if
@@ -69,7 +69,7 @@ void RunAndroidApplication(JNIEnv* env,
   }
 
   // Run the application.
-  RunNativeApplication(app_library, std::move(application_request));
+  RunNativeApplication(app_library, std::move(request));
   // TODO(vtl): See note about unloading and thread-local destructors above
   // declaration of |LoadNativeApplication()|.
   base::UnloadNativeLibrary(app_library);
@@ -133,7 +133,7 @@ AndroidHandler::AndroidHandler() : content_handler_factory_(this) {}
 AndroidHandler::~AndroidHandler() {}
 
 void AndroidHandler::RunApplication(
-    InterfaceRequest<mojom::Application> application_request,
+    InterfaceRequest<mojom::ShellClient> request,
     URLResponsePtr response) {
   JNIEnv* env = AttachCurrentThread();
   RunAndroidApplicationFn run_android_application_fn = &RunAndroidApplication;
@@ -149,7 +149,7 @@ void AndroidHandler::RunApplication(
       Java_AndroidHandler_bootstrapCachedApp(
           env, GetApplicationContext(), j_path_to_mojo.obj(),
           j_internal_app_path.obj(),
-          application_request.PassMessagePipe().release().value(),
+          request.PassMessagePipe().release().value(),
           reinterpret_cast<jlong>(run_android_application_fn));
       return;
     }
@@ -162,7 +162,7 @@ void AndroidHandler::RunApplication(
   common::BlockingCopyToFile(std::move(response->body), archive_path);
   Java_AndroidHandler_bootstrap(
       env, GetApplicationContext(), j_archive_path.obj(),
-      application_request.PassMessagePipe().release().value(),
+      request.PassMessagePipe().release().value(),
       reinterpret_cast<jlong>(run_android_application_fn));
 }