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

base/android/jni_generator/testSingleJNIAdditionalImport.golden

Index: base/android/jni_generator/testSingleJNIAdditionalImport.golden
diff --git a/base/android/jni_generator/testSingleJNIAdditionalImport.golden b/base/android/jni_generator/testSingleJNIAdditionalImport.golden
index db61dec51ecc06b6299f919b2f56d72f0b798a7d..3f8c18e8542f4f104c0d2beb73b2d6338a821641 100644
--- a/base/android/jni_generator/testSingleJNIAdditionalImport.golden
+++ b/base/android/jni_generator/testSingleJNIAdditionalImport.golden
@@ -39,7 +39,8 @@ void Java_org_chromium_foo_Foo_nativeDoSomething(JNIEnv* env, jclass jcaller,
 }
 
 static base::subtle::AtomicWord g_Foo_calledByNative = 0;
-static void Java_Foo_calledByNative(JNIEnv* env, jobject callback) {
+static void Java_Foo_calledByNative(JNIEnv* env, const
+    base::android::JavaRefOrBare<jobject>& callback) {
   CHECK_CLAZZ(env, Foo_clazz(env),
       Foo_clazz(env));
   jmethodID method_id =
@@ -55,7 +56,7 @@ static void Java_Foo_calledByNative(JNIEnv* env, jobject callback) {
       &g_Foo_calledByNative);
 
      env->CallStaticVoidMethod(Foo_clazz(env),
-          method_id, callback);
+          method_id, callback.obj());
   jni_generator::CheckException(env);
 
 }