base/android/jni_generator/testCalledByNatives.golden - Issue 115103002: Android: sync up latest JNI generator changes from downstream.

Unified Diff: base/android/jni_generator/testCalledByNatives.golden

Issue 115103002: Android: sync up latest JNI generator changes from downstream. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: "D"CHECK -> CHECK Created 6 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« base/android/jni_generator/jni_generator_helper.h ('K') | « base/android/jni_generator/sample_for_tests.cc ('k') | base/android/jni_generator/testEagerCalledByNativesOption.golden » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/android/jni_generator/testCalledByNatives.golden

diff --git a/base/android/jni_generator/testCalledByNatives.golden b/base/android/jni_generator/testCalledByNatives.golden

index 332c099c3573c2de8b3aecbbc51dfa83fef64a72..9dd6af31bb1e16fb11281bf15c198784f6151fc6 100644

--- a/base/android/jni_generator/testCalledByNatives.golden

+++ b/base/android/jni_generator/testCalledByNatives.golden

@@ -1,4 +1,4 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

@@ -12,12 +12,7 @@

#include <jni.h>

-#include "base/android/jni_android.h"

-#include "base/android/scoped_java_ref.h"

-#include "base/basictypes.h"

-#include "base/logging.h"

-using base::android::ScopedJavaLocalRef;

+#include "base/android/jni_generator/jni_generator_helper.h"

// Step 1: forward declarations.

namespace {

@@ -27,19 +22,21 @@ const char kInfoBarClassPath[] = "org/chromium/TestJni$InfoBar";

jclass g_TestJni_clazz = NULL;

// Leaking this jclass as we cannot use LazyInstance from some threads.

jclass g_InfoBar_clazz = NULL;

} // namespace

// Step 2: method stubs.

static base::subtle::AtomicWord g_TestJni_showConfirmInfoBar = 0;

-static ScopedJavaLocalRef<jobject> Java_TestJni_showConfirmInfoBar(JNIEnv* env,

- jobject obj, jint nativeInfoBar,

+static base::android::ScopedJavaLocalRef<jobject>

+ Java_TestJni_showConfirmInfoBar(JNIEnv* env, jobject obj, jint

+ nativeInfoBar,

jstring buttonOk,

jstring buttonCancel,

jstring title,

jobject icon) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz, NULL);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -57,20 +54,21 @@ static ScopedJavaLocalRef<jobject> Java_TestJni_showConfirmInfoBar(JNIEnv* env,

&g_TestJni_showConfirmInfoBar);

jobject ret =

- env->CallObjectMethod(obj,

- method_id, nativeInfoBar, buttonOk, buttonCancel, title, icon);

- base::android::CheckException(env);

- return ScopedJavaLocalRef<jobject>(env, ret);

+ env->CallObjectMethod(obj,

+ method_id, nativeInfoBar, buttonOk, buttonCancel, title, icon);

+ jni_generator::CheckException(env);

+ return base::android::ScopedJavaLocalRef<jobject>(env, ret);

}

static base::subtle::AtomicWord g_TestJni_showAutoLoginInfoBar = 0;

-static ScopedJavaLocalRef<jobject> Java_TestJni_showAutoLoginInfoBar(JNIEnv*

- env, jobject obj, jint nativeInfoBar,

+static base::android::ScopedJavaLocalRef<jobject>

+ Java_TestJni_showAutoLoginInfoBar(JNIEnv* env, jobject obj, jint

+ nativeInfoBar,

jstring realm,

jstring account,

jstring args) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz, NULL);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -87,16 +85,16 @@ static ScopedJavaLocalRef<jobject> Java_TestJni_showAutoLoginInfoBar(JNIEnv*

&g_TestJni_showAutoLoginInfoBar);

jobject ret =

- env->CallObjectMethod(obj,

- method_id, nativeInfoBar, realm, account, args);

- base::android::CheckException(env);

- return ScopedJavaLocalRef<jobject>(env, ret);

+ env->CallObjectMethod(obj,

+ method_id, nativeInfoBar, realm, account, args);

+ jni_generator::CheckException(env);

+ return base::android::ScopedJavaLocalRef<jobject>(env, ret);

}

static base::subtle::AtomicWord g_InfoBar_dismiss = 0;

static void Java_InfoBar_dismiss(JNIEnv* env, jobject obj) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_InfoBar_clazz);

+ CHECK_CLAZZ(g_InfoBar_clazz);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -108,9 +106,9 @@ static void Java_InfoBar_dismiss(JNIEnv* env, jobject obj) {

"V",

&g_InfoBar_dismiss);

- env->CallVoidMethod(obj,

- method_id);

- base::android::CheckException(env);

+ env->CallVoidMethod(obj,

+ method_id);

+ jni_generator::CheckException(env);

}

@@ -120,7 +118,7 @@ static jboolean Java_TestJni_shouldShowAutoLogin(JNIEnv* env, jobject view,

jstring account,

jstring args) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz, false);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_STATIC>(

@@ -137,17 +135,17 @@ static jboolean Java_TestJni_shouldShowAutoLogin(JNIEnv* env, jobject view,

&g_TestJni_shouldShowAutoLogin);

jboolean ret =

- env->CallStaticBooleanMethod(g_TestJni_clazz,

- method_id, view, realm, account, args);

- base::android::CheckException(env);

+ env->CallStaticBooleanMethod(g_TestJni_clazz,

+ method_id, view, realm, account, args);

+ jni_generator::CheckException(env);

return ret;

}

static base::subtle::AtomicWord g_TestJni_openUrl = 0;

-static ScopedJavaLocalRef<jobject> Java_TestJni_openUrl(JNIEnv* env, jstring

- url) {

+static base::android::ScopedJavaLocalRef<jobject> Java_TestJni_openUrl(JNIEnv*

+ env, jstring url) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz, NULL);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_STATIC>(

@@ -161,10 +159,10 @@ static ScopedJavaLocalRef<jobject> Java_TestJni_openUrl(JNIEnv* env, jstring

&g_TestJni_openUrl);

jobject ret =

- env->CallStaticObjectMethod(g_TestJni_clazz,

- method_id, url);

- base::android::CheckException(env);

- return ScopedJavaLocalRef<jobject>(env, ret);

+ env->CallStaticObjectMethod(g_TestJni_clazz,

+ method_id, url);

+ jni_generator::CheckException(env);

+ return base::android::ScopedJavaLocalRef<jobject>(env, ret);

}

static base::subtle::AtomicWord g_TestJni_activateHardwareAcceleration = 0;

@@ -175,7 +173,7 @@ static void Java_TestJni_activateHardwareAcceleration(JNIEnv* env, jobject obj,

jint iPrimaryID,

jint iSecondaryID) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -192,16 +190,16 @@ static void Java_TestJni_activateHardwareAcceleration(JNIEnv* env, jobject obj,

"V",

&g_TestJni_activateHardwareAcceleration);

- env->CallVoidMethod(obj,

- method_id, activated, iPid, iType, iPrimaryID, iSecondaryID);

- base::android::CheckException(env);

+ env->CallVoidMethod(obj,

+ method_id, activated, iPid, iType, iPrimaryID, iSecondaryID);

+ jni_generator::CheckException(env);

}

static base::subtle::AtomicWord g_TestJni_uncheckedCall = 0;

static void Java_TestJni_uncheckedCall(JNIEnv* env, jobject obj, jint iParam) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -214,16 +212,16 @@ static void Java_TestJni_uncheckedCall(JNIEnv* env, jobject obj, jint iParam) {

"V",

&g_TestJni_uncheckedCall);

- env->CallVoidMethod(obj,

- method_id, iParam);

+ env->CallVoidMethod(obj,

+ method_id, iParam);

}

static base::subtle::AtomicWord g_TestJni_returnByteArray = 0;

-static ScopedJavaLocalRef<jbyteArray> Java_TestJni_returnByteArray(JNIEnv* env,

- jobject obj) {

+static base::android::ScopedJavaLocalRef<jbyteArray>

+ Java_TestJni_returnByteArray(JNIEnv* env, jobject obj) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz, NULL);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -236,17 +234,17 @@ static ScopedJavaLocalRef<jbyteArray> Java_TestJni_returnByteArray(JNIEnv* env,

&g_TestJni_returnByteArray);

jbyteArray ret =

- static_cast<jbyteArray>(env->CallObjectMethod(obj,

- method_id));

- base::android::CheckException(env);

- return ScopedJavaLocalRef<jbyteArray>(env, ret);

+ static_cast<jbyteArray>(env->CallObjectMethod(obj,

+ method_id));

+ jni_generator::CheckException(env);

+ return base::android::ScopedJavaLocalRef<jbyteArray>(env, ret);

}

static base::subtle::AtomicWord g_TestJni_returnBooleanArray = 0;

-static ScopedJavaLocalRef<jbooleanArray> Java_TestJni_returnBooleanArray(JNIEnv*

- env, jobject obj) {

+static base::android::ScopedJavaLocalRef<jbooleanArray>

+ Java_TestJni_returnBooleanArray(JNIEnv* env, jobject obj) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz, NULL);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -259,17 +257,17 @@ static ScopedJavaLocalRef<jbooleanArray> Java_TestJni_returnBooleanArray(JNIEnv*

&g_TestJni_returnBooleanArray);

jbooleanArray ret =

- static_cast<jbooleanArray>(env->CallObjectMethod(obj,

- method_id));

- base::android::CheckException(env);

- return ScopedJavaLocalRef<jbooleanArray>(env, ret);

+ static_cast<jbooleanArray>(env->CallObjectMethod(obj,

+ method_id));

+ jni_generator::CheckException(env);

+ return base::android::ScopedJavaLocalRef<jbooleanArray>(env, ret);

}

static base::subtle::AtomicWord g_TestJni_returnCharArray = 0;

-static ScopedJavaLocalRef<jcharArray> Java_TestJni_returnCharArray(JNIEnv* env,

- jobject obj) {

+static base::android::ScopedJavaLocalRef<jcharArray>

+ Java_TestJni_returnCharArray(JNIEnv* env, jobject obj) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz, NULL);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -282,17 +280,17 @@ static ScopedJavaLocalRef<jcharArray> Java_TestJni_returnCharArray(JNIEnv* env,

&g_TestJni_returnCharArray);

jcharArray ret =

- static_cast<jcharArray>(env->CallObjectMethod(obj,

- method_id));

- base::android::CheckException(env);

- return ScopedJavaLocalRef<jcharArray>(env, ret);

+ static_cast<jcharArray>(env->CallObjectMethod(obj,

+ method_id));

+ jni_generator::CheckException(env);

+ return base::android::ScopedJavaLocalRef<jcharArray>(env, ret);

}

static base::subtle::AtomicWord g_TestJni_returnShortArray = 0;

-static ScopedJavaLocalRef<jshortArray> Java_TestJni_returnShortArray(JNIEnv*

- env, jobject obj) {

+static base::android::ScopedJavaLocalRef<jshortArray>

+ Java_TestJni_returnShortArray(JNIEnv* env, jobject obj) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz, NULL);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -305,17 +303,17 @@ static ScopedJavaLocalRef<jshortArray> Java_TestJni_returnShortArray(JNIEnv*

&g_TestJni_returnShortArray);

jshortArray ret =

- static_cast<jshortArray>(env->CallObjectMethod(obj,

- method_id));

- base::android::CheckException(env);

- return ScopedJavaLocalRef<jshortArray>(env, ret);

+ static_cast<jshortArray>(env->CallObjectMethod(obj,

+ method_id));

+ jni_generator::CheckException(env);

+ return base::android::ScopedJavaLocalRef<jshortArray>(env, ret);

}

static base::subtle::AtomicWord g_TestJni_returnIntArray = 0;

-static ScopedJavaLocalRef<jintArray> Java_TestJni_returnIntArray(JNIEnv* env,

- jobject obj) {

+static base::android::ScopedJavaLocalRef<jintArray>

+ Java_TestJni_returnIntArray(JNIEnv* env, jobject obj) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz, NULL);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -328,17 +326,17 @@ static ScopedJavaLocalRef<jintArray> Java_TestJni_returnIntArray(JNIEnv* env,

&g_TestJni_returnIntArray);

jintArray ret =

- static_cast<jintArray>(env->CallObjectMethod(obj,

- method_id));

- base::android::CheckException(env);

- return ScopedJavaLocalRef<jintArray>(env, ret);

+ static_cast<jintArray>(env->CallObjectMethod(obj,

+ method_id));

+ jni_generator::CheckException(env);

+ return base::android::ScopedJavaLocalRef<jintArray>(env, ret);

}

static base::subtle::AtomicWord g_TestJni_returnLongArray = 0;

-static ScopedJavaLocalRef<jlongArray> Java_TestJni_returnLongArray(JNIEnv* env,

- jobject obj) {

+static base::android::ScopedJavaLocalRef<jlongArray>

+ Java_TestJni_returnLongArray(JNIEnv* env, jobject obj) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz, NULL);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -351,17 +349,17 @@ static ScopedJavaLocalRef<jlongArray> Java_TestJni_returnLongArray(JNIEnv* env,

&g_TestJni_returnLongArray);

jlongArray ret =

- static_cast<jlongArray>(env->CallObjectMethod(obj,

- method_id));

- base::android::CheckException(env);

- return ScopedJavaLocalRef<jlongArray>(env, ret);

+ static_cast<jlongArray>(env->CallObjectMethod(obj,

+ method_id));

+ jni_generator::CheckException(env);

+ return base::android::ScopedJavaLocalRef<jlongArray>(env, ret);

}

static base::subtle::AtomicWord g_TestJni_returnDoubleArray = 0;

-static ScopedJavaLocalRef<jdoubleArray> Java_TestJni_returnDoubleArray(JNIEnv*

- env, jobject obj) {

+static base::android::ScopedJavaLocalRef<jdoubleArray>

+ Java_TestJni_returnDoubleArray(JNIEnv* env, jobject obj) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz, NULL);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -374,17 +372,17 @@ static ScopedJavaLocalRef<jdoubleArray> Java_TestJni_returnDoubleArray(JNIEnv*

&g_TestJni_returnDoubleArray);

jdoubleArray ret =

- static_cast<jdoubleArray>(env->CallObjectMethod(obj,

- method_id));

- base::android::CheckException(env);

- return ScopedJavaLocalRef<jdoubleArray>(env, ret);

+ static_cast<jdoubleArray>(env->CallObjectMethod(obj,

+ method_id));

+ jni_generator::CheckException(env);

+ return base::android::ScopedJavaLocalRef<jdoubleArray>(env, ret);

}

static base::subtle::AtomicWord g_TestJni_returnObjectArray = 0;

-static ScopedJavaLocalRef<jobjectArray> Java_TestJni_returnObjectArray(JNIEnv*

- env, jobject obj) {

+static base::android::ScopedJavaLocalRef<jobjectArray>

+ Java_TestJni_returnObjectArray(JNIEnv* env, jobject obj) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz, NULL);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -397,17 +395,17 @@ static ScopedJavaLocalRef<jobjectArray> Java_TestJni_returnObjectArray(JNIEnv*

&g_TestJni_returnObjectArray);

jobjectArray ret =

- static_cast<jobjectArray>(env->CallObjectMethod(obj,

- method_id));

- base::android::CheckException(env);

- return ScopedJavaLocalRef<jobjectArray>(env, ret);

+ static_cast<jobjectArray>(env->CallObjectMethod(obj,

+ method_id));

+ jni_generator::CheckException(env);

+ return base::android::ScopedJavaLocalRef<jobjectArray>(env, ret);

}

static base::subtle::AtomicWord g_TestJni_returnArrayOfByteArray = 0;

-static ScopedJavaLocalRef<jobjectArray>

+static base::android::ScopedJavaLocalRef<jobjectArray>

Java_TestJni_returnArrayOfByteArray(JNIEnv* env, jobject obj) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz, NULL);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -420,17 +418,17 @@ static ScopedJavaLocalRef<jobjectArray>

&g_TestJni_returnArrayOfByteArray);

jobjectArray ret =

- static_cast<jobjectArray>(env->CallObjectMethod(obj,

- method_id));

- base::android::CheckException(env);

- return ScopedJavaLocalRef<jobjectArray>(env, ret);

+ static_cast<jobjectArray>(env->CallObjectMethod(obj,

+ method_id));

+ jni_generator::CheckException(env);

+ return base::android::ScopedJavaLocalRef<jobjectArray>(env, ret);

}

static base::subtle::AtomicWord g_TestJni_getCompressFormat = 0;

-static ScopedJavaLocalRef<jobject> Java_TestJni_getCompressFormat(JNIEnv* env,

- jobject obj) {

+static base::android::ScopedJavaLocalRef<jobject>

+ Java_TestJni_getCompressFormat(JNIEnv* env, jobject obj) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz, NULL);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -443,17 +441,17 @@ static ScopedJavaLocalRef<jobject> Java_TestJni_getCompressFormat(JNIEnv* env,

&g_TestJni_getCompressFormat);

jobject ret =

- env->CallObjectMethod(obj,

- method_id);

- base::android::CheckException(env);

- return ScopedJavaLocalRef<jobject>(env, ret);

+ env->CallObjectMethod(obj,

+ method_id);

+ jni_generator::CheckException(env);

+ return base::android::ScopedJavaLocalRef<jobject>(env, ret);

}

static base::subtle::AtomicWord g_TestJni_getCompressFormatList = 0;

-static ScopedJavaLocalRef<jobject> Java_TestJni_getCompressFormatList(JNIEnv*

- env, jobject obj) {

+static base::android::ScopedJavaLocalRef<jobject>

+ Java_TestJni_getCompressFormatList(JNIEnv* env, jobject obj) {

/* Must call RegisterNativesImpl() */

- DCHECK(g_TestJni_clazz);

+ CHECK_CLAZZ(g_TestJni_clazz, NULL);

jmethodID method_id =

base::android::MethodID::LazyGet<

base::android::MethodID::TYPE_INSTANCE>(

@@ -466,20 +464,20 @@ static ScopedJavaLocalRef<jobject> Java_TestJni_getCompressFormatList(JNIEnv*

&g_TestJni_getCompressFormatList);

jobject ret =

- env->CallObjectMethod(obj,

- method_id);

- base::android::CheckException(env);

- return ScopedJavaLocalRef<jobject>(env, ret);

+ env->CallObjectMethod(obj,

+ method_id);

+ jni_generator::CheckException(env);

+ return base::android::ScopedJavaLocalRef<jobject>(env, ret);

}

// Step 3: RegisterNatives.

static bool RegisterNativesImpl(JNIEnv* env) {

g_TestJni_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(

base::android::GetClass(env, kTestJniClassPath).obj()));

g_InfoBar_clazz = reinterpret_cast<jclass>(env->NewGlobalRef(

base::android::GetClass(env, kInfoBarClassPath).obj()));

return true;

}