Replaces |shell_handle| with |application_request| as the name of the parameter to MojoMain().

services/android/java_handler.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/android/java_handler.h"
 
 #include "base/android/base_jni_onload.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/library_loader/library_loader_hooks.h"
@@ skipping 63 matching lines @@
     return false;
 
   if (!mojo::android::RegisterBaseRunLoop(env))
     return false;
 
   return true;
 }
 
 }  // namespace
 
-MojoResult MojoMain(MojoHandle shell_handle) {
+MojoResult MojoMain(MojoHandle application_request) {
   mojo::ApplicationRunnerChromium runner(new services::android::JavaHandler());
-  return runner.Run(shell_handle);
+  return runner.Run(application_request);
 }
 
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
   std::vector<base::android::RegisterCallback> register_callbacks;
   register_callbacks.push_back(base::Bind(&RegisterJNI));
   if (!base::android::OnJNIOnLoadRegisterJNI(vm, register_callbacks) ||
       !base::android::OnJNIOnLoadInit(
           std::vector<base::android::InitCallback>())) {
     return -1;
   }
 
   // There cannot be two AtExit objects triggering at the same time. Remove the
   // one from LibraryLoader as ApplicationRunnerChromium also uses one.
   base::android::LibraryLoaderExitHook();
 
   return JNI_VERSION_1_4;
 }
 
 // This is needed because the application needs to access the application
 // context.
 extern "C" JNI_EXPORT void InitApplicationContext(
     const base::android::JavaRef<jobject>& context) {
   JNIEnv* env = base::android::AttachCurrentThread();
   base::android::InitApplicationContext(env, context);
 }