Roll base to 0032c8e1a72eb85d947d8df8de503caa62b4d0a8.

shell/android/main.cc

 // Copyright 2013 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 "shell/android/main.h"
 
 #include <stdio.h>
 
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.h"
@@ skipping 220 matching lines @@
   mojo::NetworkServicePtr network_service;
   context->application_manager()->ConnectToService(GURL("mojo:network_service"),
                                                    &network_service);
   breakpad::UploadCrashes(dumps_path, context->task_runners()->blocking_pool(),
                           network_service.Pass());
 }
 
 }  // namespace
 
 static void Start(JNIEnv* env,
-                  jclass clazz,
-                  jobject application_context,
-                  jobject j_asset_manager,
-                  jstring mojo_shell_child_path,
-                  jobjectArray jparameters,
-                  jstring j_local_apps_directory,
-                  jstring j_tmp_dir,
-                  jstring j_home_dir) {
+                  const JavaParamRef<jclass>& clazz,
+                  const JavaParamRef<jobject>& application_context,
+                  const JavaParamRef<jobject>& j_asset_manager,
+                  const JavaParamRef<jstring>& mojo_shell_child_path,
+                  const JavaParamRef<jobjectArray>& jparameters,
+                  const JavaParamRef<jstring>& j_local_apps_directory,
+                  const JavaParamRef<jstring>& j_tmp_dir,
+                  const JavaParamRef<jstring>& j_home_dir) {
   // Initially, the shell runner is not ready.
   g_internal_data.Get().shell_runner_ready.reset(
       new base::WaitableEvent(true, false));
 
   std::string tmp_dir = base::android::ConvertJavaStringToUTF8(env, j_tmp_dir);
   // Setting the TMPDIR and HOME environment variables so that applications can
   // use it.
   // TODO(qsr) We will need our subprocesses to inherit this.
   int return_value = setenv("TMPDIR", tmp_dir.c_str(), 1);
   DCHECK_EQ(return_value, 0);
@@ skipping 66 matching lines @@
   g_internal_data.Get().shell_runner_ready->Wait();
 
   // Upload crashes after one minute.
   g_internal_data.Get().shell_task_runner->PostDelayedTask(
       FROM_HERE, base::Bind(&UploadCrashes, dumps_path),
       base::TimeDelta::FromSeconds(kDelayBeforeCrashUploadInSeconds));
 
   gpu::ApplyGpuDriverBugWorkarounds(command_line);
 }
 
-static void AddApplicationURL(JNIEnv* env, jclass clazz, jstring jurl) {
+static void AddApplicationURL(JNIEnv* env,
+                              const JavaParamRef<jclass>& clazz,
+                              const JavaParamRef<jstring>& jurl) {
   base::CommandLine::ForCurrentProcess()->AppendArg(
       base::android::ConvertJavaStringToUTF8(env, jurl));
 }
 
-static void StartApplicationURL(JNIEnv* env, jclass clazz, jstring jurl) {
+static void StartApplicationURL(JNIEnv* env,
+                                const JavaParamRef<jclass>& clazz,
+                                const JavaParamRef<jstring>& jurl) {
   std::string url = base::android::ConvertJavaStringToUTF8(env, jurl);
   g_internal_data.Get().shell_task_runner->PostTask(
       FROM_HERE, base::Bind(&EmbedApplicationByURL, url));
 }
 
-static void BindShell(JNIEnv* env, jclass clazz, jint shell_handle) {
+static void BindShell(JNIEnv* env,
+                      const JavaParamRef<jclass>& clazz,
+                      jint shell_handle) {
   g_internal_data.Get().shell_task_runner->PostTask(
       FROM_HERE,
       base::Bind(&BindShellImpl, base::Passed(mojo::ScopedMessagePipeHandle(
                                      mojo::MessagePipeHandle(shell_handle)))));
 }
 
-static void QuitShell(JNIEnv* env, jclass jcaller) {
+static void QuitShell(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
   g_internal_data.Get().shell_task_runner->PostTask(
       FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
 }
 
 bool RegisterShellService(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace shell