Roll base to 0032c8e1a72eb85d947d8df8de503caa62b4d0a8.

mojo/android/javatests/mojo_test_case.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 "mojo/android/javatests/mojo_test_case.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
@@ skipping 14 matching lines @@
   base::ShadowingAtExitManager at_exit;
   base::MessageLoop message_loop;
 };
 
 }  // namespace
 
 namespace mojo {
 namespace android {
 
 static void InitApplicationContext(JNIEnv* env,
-                                   jobject jcaller,
-                                   jobject context) {
+                                   const JavaParamRef<jobject>& jcaller,
+                                   const JavaParamRef<jobject>& context) {
   base::android::ScopedJavaLocalRef<jobject> scoped_context(env, context);
   base::android::InitApplicationContext(env, scoped_context);
   base::InitAndroidTestMessageLoop();
 }
 
-static jlong SetupTestEnvironment(JNIEnv* env, jobject jcaller) {
+static jlong SetupTestEnvironment(JNIEnv* env,
+                                  const JavaParamRef<jobject>& jcaller) {
   return reinterpret_cast<intptr_t>(new TestEnvironment());
 }
 
 static void TearDownTestEnvironment(JNIEnv* env,
-                                    jobject jcaller,
+                                    const JavaParamRef<jobject>& jcaller,
                                     jlong test_environment) {
   delete reinterpret_cast<TestEnvironment*>(test_environment);
 }
 
-static void RunLoop(JNIEnv* env, jobject jcaller, jlong timeout_ms) {
+static void RunLoop(JNIEnv* env,
+                    const JavaParamRef<jobject>& jcaller,
+                    jlong timeout_ms) {
   base::RunLoop run_loop;
   if (timeout_ms) {
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::MessageLoop::QuitClosure(),
         base::TimeDelta::FromMilliseconds(timeout_ms));
     run_loop.Run();
   } else {
     run_loop.RunUntilIdle();
   }
 }
 
 bool RegisterMojoTestCase(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace mojo