Roll base to 9e74307b276b2f9988005c0e97e85ee222586f79.

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 16 matching lines @@
 };
 
 }  // namespace
 
 namespace mojo {
 namespace android {
 
 static void InitApplicationContext(JNIEnv* env,
                                    const JavaParamRef<jobject>& jcaller,
                                    const JavaParamRef<jobject>& context) {
-  base::android::ScopedJavaLocalRef<jobject> scoped_context(env, context);
-  base::android::InitApplicationContext(env, scoped_context);
+  base::android::InitApplicationContext(env, context);
   base::InitAndroidTestMessageLoop();
 }
 
 static jlong SetupTestEnvironment(JNIEnv* env,
                                   const JavaParamRef<jobject>& jcaller) {
   return reinterpret_cast<intptr_t>(new TestEnvironment());
 }
 
 static void TearDownTestEnvironment(JNIEnv* env,
                                     const JavaParamRef<jobject>& jcaller,
@@ skipping 15 matching lines @@
     run_loop.RunUntilIdle();
   }
 }
 
 bool RegisterMojoTestCase(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 }  // namespace mojo