JNI: allow either JavaRef or bare objects in Java calls.

base/android/jni_generator/testMultipleJNIAdditionalImport.golden

 // 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.
 
 // This file is autogenerated by
 //     base/android/jni_generator/jni_generator.py
 // For
 //     org/chromium/foo/Foo
 
 #ifndef org_chromium_foo_Foo_JNI
@@ skipping 24 matching lines @@
 extern "C" __attribute__((visibility("default")))
 void Java_org_chromium_foo_Foo_nativeDoSomething(JNIEnv* env, jclass jcaller,
     jobject callback1,
     jobject callback2) {
   return DoSomething(env, base::android::JavaParamRef<jclass>(env, jcaller),
       base::android::JavaParamRef<jobject>(env, callback1),
       base::android::JavaParamRef<jobject>(env, callback2));
 }
 
 static base::subtle::AtomicWord g_Foo_calledByNative = 0;
-static void Java_Foo_calledByNative(JNIEnv* env, jobject callback1,
-    jobject callback2) {
+static void Java_Foo_calledByNative(JNIEnv* env, const
+    base::android::JavaRefOrBare<jobject>& callback1,
+    const base::android::JavaRefOrBare<jobject>& callback2) {
   CHECK_CLAZZ(env, Foo_clazz(env),
       Foo_clazz(env));
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
       env, Foo_clazz(env),
       "calledByNative",
 
 "("
 "Lorg/chromium/foo/Bar1$Callback;"
 "Lorg/chromium/foo/Bar2$Callback;"
 ")"
 "V",
       &g_Foo_calledByNative);
 
      env->CallStaticVoidMethod(Foo_clazz(env),
-          method_id, callback1, callback2);
+          method_id, callback1.obj(), callback2.obj());
   jni_generator::CheckException(env);
 
 }
 
 // Step 3: RegisterNatives.
 
 static const JNINativeMethod kMethodsFoo[] = {
     { "nativeDoSomething",
 "("
 "Lorg/chromium/foo/Bar1$Callback;"
@@ skipping 12 matching lines @@
                            kMethodsFooSize) < 0) {
     jni_generator::HandleRegistrationError(
         env, Foo_clazz(env), __FILE__);
     return false;
   }
 
   return true;
 }
 
 #endif  // org_chromium_foo_Foo_JNI