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

base/android/jni_generator/golden_sample_for_tests_jni.h

 // 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/example/jni_generator/SampleForTests
 
 #ifndef org_chromium_example_jni_generator_SampleForTests_JNI
@@ skipping 172 matching lines @@
 
 extern "C" __attribute__((visibility("default")))
 jint
     Java_org_chromium_example_jni_1generator_SampleForTests_00024InnerClass_nativeGetInnerIntFunction(JNIEnv*
     env, jclass jcaller) {
   return GetInnerIntFunction(env, base::android::JavaParamRef<jclass>(env,
       jcaller));
 }
 
 static base::subtle::AtomicWord g_SampleForTests_javaMethod = 0;
-static jint Java_SampleForTests_javaMethod(JNIEnv* env, jobject obj,
-    JniIntWrapper foo,
+static jint Java_SampleForTests_javaMethod(JNIEnv* env, const
+    base::android::JavaRefOrBare<jobject>& obj, JniIntWrapper foo,
     JniIntWrapper bar) {
-  CHECK_CLAZZ(env, obj,
+  CHECK_CLAZZ(env, obj.obj(),
       SampleForTests_clazz(env), 0);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, SampleForTests_clazz(env),
       "javaMethod",
 
 "("
 "I"
 "I"
 ")"
 "I",
       &g_SampleForTests_javaMethod);
 
   jint ret =
-      env->CallIntMethod(obj,
+      env->CallIntMethod(obj.obj(),
           method_id, as_jint(foo), as_jint(bar));
   jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_SampleForTests_staticJavaMethod = 0;
 static jboolean Java_SampleForTests_staticJavaMethod(JNIEnv* env) {
   CHECK_CLAZZ(env, SampleForTests_clazz(env),
       SampleForTests_clazz(env), false);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
       env, SampleForTests_clazz(env),
       "staticJavaMethod",
 
 "("
 ")"
 "Z",
       &g_SampleForTests_staticJavaMethod);
 
   jboolean ret =
       env->CallStaticBooleanMethod(SampleForTests_clazz(env),
           method_id);
   jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_SampleForTests_packagePrivateJavaMethod = 0;
-static void Java_SampleForTests_packagePrivateJavaMethod(JNIEnv* env, jobject
-    obj) {
-  CHECK_CLAZZ(env, obj,
+static void Java_SampleForTests_packagePrivateJavaMethod(JNIEnv* env, const
+    base::android::JavaRefOrBare<jobject>& obj) {
+  CHECK_CLAZZ(env, obj.obj(),
       SampleForTests_clazz(env));
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, SampleForTests_clazz(env),
       "packagePrivateJavaMethod",
 
 "("
 ")"
 "V",
       &g_SampleForTests_packagePrivateJavaMethod);
 
-     env->CallVoidMethod(obj,
+     env->CallVoidMethod(obj.obj(),
           method_id);
   jni_generator::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_SampleForTests_methodThatThrowsException = 0;
-static void Java_SampleForTests_methodThatThrowsException(JNIEnv* env, jobject
-    obj) {
-  CHECK_CLAZZ(env, obj,
+static void Java_SampleForTests_methodThatThrowsException(JNIEnv* env, const
+    base::android::JavaRefOrBare<jobject>& obj) {
+  CHECK_CLAZZ(env, obj.obj(),
       SampleForTests_clazz(env));
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, SampleForTests_clazz(env),
       "methodThatThrowsException",
 
 "("
 ")"
 "V",
       &g_SampleForTests_methodThatThrowsException);
 
-     env->CallVoidMethod(obj,
+     env->CallVoidMethod(obj.obj(),
           method_id);
 
 }
 
 static base::subtle::AtomicWord g_InnerStructA_create = 0;
 static base::android::ScopedJavaLocalRef<jobject>
     Java_InnerStructA_create(JNIEnv* env, jlong l,
     JniIntWrapper i,
-    jstring s) {
+    const base::android::JavaRefOrBare<jstring>& s) {
   CHECK_CLAZZ(env, InnerStructA_clazz(env),
       InnerStructA_clazz(env), NULL);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_STATIC>(
       env, InnerStructA_clazz(env),
       "create",
 
 "("
 "J"
 "I"
 "Ljava/lang/String;"
 ")"
 "Lorg/chromium/example/jni_generator/SampleForTests$InnerStructA;",
       &g_InnerStructA_create);
 
   jobject ret =
       env->CallStaticObjectMethod(InnerStructA_clazz(env),
-          method_id, l, as_jint(i), s);
+          method_id, l, as_jint(i), s.obj());
   jni_generator::CheckException(env);
   return base::android::ScopedJavaLocalRef<jobject>(env, ret);
 }
 
 static base::subtle::AtomicWord g_SampleForTests_addStructA = 0;
-static void Java_SampleForTests_addStructA(JNIEnv* env, jobject obj, jobject a)
-    {
-  CHECK_CLAZZ(env, obj,
+static void Java_SampleForTests_addStructA(JNIEnv* env, const
+    base::android::JavaRefOrBare<jobject>& obj, const
+    base::android::JavaRefOrBare<jobject>& a) {
+  CHECK_CLAZZ(env, obj.obj(),
       SampleForTests_clazz(env));
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, SampleForTests_clazz(env),
       "addStructA",
 
 "("
 "Lorg/chromium/example/jni_generator/SampleForTests$InnerStructA;"
 ")"
 "V",
       &g_SampleForTests_addStructA);
 
-     env->CallVoidMethod(obj,
-          method_id, a);
+     env->CallVoidMethod(obj.obj(),
+          method_id, a.obj());
   jni_generator::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_SampleForTests_iterateAndDoSomething = 0;
-static void Java_SampleForTests_iterateAndDoSomething(JNIEnv* env, jobject obj)
-    {
-  CHECK_CLAZZ(env, obj,
+static void Java_SampleForTests_iterateAndDoSomething(JNIEnv* env, const
+    base::android::JavaRefOrBare<jobject>& obj) {
+  CHECK_CLAZZ(env, obj.obj(),
       SampleForTests_clazz(env));
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, SampleForTests_clazz(env),
       "iterateAndDoSomething",
 
 "("
 ")"
 "V",
       &g_SampleForTests_iterateAndDoSomething);
 
-     env->CallVoidMethod(obj,
+     env->CallVoidMethod(obj.obj(),
           method_id);
   jni_generator::CheckException(env);
 
 }
 
 static base::subtle::AtomicWord g_InnerStructB_getKey = 0;
-static jlong Java_InnerStructB_getKey(JNIEnv* env, jobject obj) {
-  CHECK_CLAZZ(env, obj,
+static jlong Java_InnerStructB_getKey(JNIEnv* env, const
+    base::android::JavaRefOrBare<jobject>& obj) {
+  CHECK_CLAZZ(env, obj.obj(),
       InnerStructB_clazz(env), 0);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, InnerStructB_clazz(env),
       "getKey",
 
 "("
 ")"
 "J",
       &g_InnerStructB_getKey);
 
   jlong ret =
-      env->CallLongMethod(obj,
+      env->CallLongMethod(obj.obj(),
           method_id);
   jni_generator::CheckException(env);
   return ret;
 }
 
 static base::subtle::AtomicWord g_InnerStructB_getValue = 0;
 static base::android::ScopedJavaLocalRef<jstring>
-    Java_InnerStructB_getValue(JNIEnv* env, jobject obj) {
-  CHECK_CLAZZ(env, obj,
+    Java_InnerStructB_getValue(JNIEnv* env, const
+    base::android::JavaRefOrBare<jobject>& obj) {
+  CHECK_CLAZZ(env, obj.obj(),
       InnerStructB_clazz(env), NULL);
   jmethodID method_id =
       base::android::MethodID::LazyGet<
       base::android::MethodID::TYPE_INSTANCE>(
       env, InnerStructB_clazz(env),
       "getValue",
 
 "("
 ")"
 "Ljava/lang/String;",
       &g_InnerStructB_getValue);
 
   jstring ret =
-      static_cast<jstring>(env->CallObjectMethod(obj,
+      static_cast<jstring>(env->CallObjectMethod(obj.obj(),
           method_id));
   jni_generator::CheckException(env);
   return base::android::ScopedJavaLocalRef<jstring>(env, ret);
 }
 
 // Step 3: RegisterNatives.
 
 static const JNINativeMethod kMethodsInnerClass[] = {
     { "nativeGetInnerIntFunction",
 "("
@@ skipping 104 matching lines @@
     return false;
   }
 
   return true;
 }
 
 }  // namespace android
 }  // namespace base
 
 #endif  // org_chromium_example_jni_generator_SampleForTests_JNI