Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(585)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1308363003: Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « base/android/jni_generator/sample_for_tests.cc ('k') | base/android/jni_generator/testConstantsFromJavaP.golden » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 3bc586c47eb4275c8a64a611e6f406e4f688bde3..e33356aa4e539e9b662b92e21daa3da9dbd0afc5 100644
--- a/base/android/jni_generator/testCalledByNatives.golden
+++ b/base/android/jni_generator/testCalledByNatives.golden
@@ -32,8 +32,9 @@
// Step 2: method stubs.
static base::subtle::AtomicWord g_TestJni_showConfirmInfoBar = 0;
-static ScopedJavaLocalRef<jobject> Java_TestJni_showConfirmInfoBar(JNIEnv* env,
- jobject obj, JniIntWrapper nativeInfoBar,
+static base::android::ScopedJavaLocalRef<jobject>
+ Java_TestJni_showConfirmInfoBar(JNIEnv* env, jobject obj, JniIntWrapper
+ nativeInfoBar,
jstring buttonOk,
jstring buttonCancel,
jstring title,
@@ -62,12 +63,13 @@
method_id, as_jint(nativeInfoBar), buttonOk, buttonCancel, title,
icon);
jni_generator::CheckException(env);
- return ScopedJavaLocalRef<jobject>(env, ret);
+ 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, JniIntWrapper nativeInfoBar,
+static base::android::ScopedJavaLocalRef<jobject>
+ Java_TestJni_showAutoLoginInfoBar(JNIEnv* env, jobject obj, JniIntWrapper
+ nativeInfoBar,
jstring realm,
jstring account,
jstring args) {
@@ -93,7 +95,7 @@
env->CallObjectMethod(obj,
method_id, as_jint(nativeInfoBar), realm, account, args);
jni_generator::CheckException(env);
- return ScopedJavaLocalRef<jobject>(env, ret);
+ return base::android::ScopedJavaLocalRef<jobject>(env, ret);
}
static base::subtle::AtomicWord g_InfoBar_dismiss = 0;
@@ -149,8 +151,8 @@
}
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() */
CHECK_CLAZZ(env, TestJni_clazz(env),
TestJni_clazz(env), NULL);
@@ -170,7 +172,7 @@
env->CallStaticObjectMethod(TestJni_clazz(env),
method_id, url);
jni_generator::CheckException(env);
- return ScopedJavaLocalRef<jobject>(env, ret);
+ return base::android::ScopedJavaLocalRef<jobject>(env, ret);
}
static base::subtle::AtomicWord g_TestJni_activateHardwareAcceleration = 0;
@@ -230,8 +232,8 @@
}
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() */
CHECK_CLAZZ(env, obj,
TestJni_clazz(env), NULL);
@@ -250,12 +252,12 @@
static_cast<jbyteArray>(env->CallObjectMethod(obj,
method_id));
jni_generator::CheckException(env);
- return ScopedJavaLocalRef<jbyteArray>(env, ret);
+ 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() */
CHECK_CLAZZ(env, obj,
TestJni_clazz(env), NULL);
@@ -274,12 +276,12 @@
static_cast<jbooleanArray>(env->CallObjectMethod(obj,
method_id));
jni_generator::CheckException(env);
- return ScopedJavaLocalRef<jbooleanArray>(env, ret);
+ 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() */
CHECK_CLAZZ(env, obj,
TestJni_clazz(env), NULL);
@@ -298,12 +300,12 @@
static_cast<jcharArray>(env->CallObjectMethod(obj,
method_id));
jni_generator::CheckException(env);
- return ScopedJavaLocalRef<jcharArray>(env, ret);
+ 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() */
CHECK_CLAZZ(env, obj,
TestJni_clazz(env), NULL);
@@ -322,12 +324,12 @@
static_cast<jshortArray>(env->CallObjectMethod(obj,
method_id));
jni_generator::CheckException(env);
- return ScopedJavaLocalRef<jshortArray>(env, ret);
+ 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() */
CHECK_CLAZZ(env, obj,
TestJni_clazz(env), NULL);
@@ -346,12 +348,12 @@
static_cast<jintArray>(env->CallObjectMethod(obj,
method_id));
jni_generator::CheckException(env);
- return ScopedJavaLocalRef<jintArray>(env, ret);
+ 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() */
CHECK_CLAZZ(env, obj,
TestJni_clazz(env), NULL);
@@ -370,12 +372,12 @@
static_cast<jlongArray>(env->CallObjectMethod(obj,
method_id));
jni_generator::CheckException(env);
- return ScopedJavaLocalRef<jlongArray>(env, ret);
+ 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() */
CHECK_CLAZZ(env, obj,
TestJni_clazz(env), NULL);
@@ -394,12 +396,12 @@
static_cast<jdoubleArray>(env->CallObjectMethod(obj,
method_id));
jni_generator::CheckException(env);
- return ScopedJavaLocalRef<jdoubleArray>(env, ret);
+ 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() */
CHECK_CLAZZ(env, obj,
TestJni_clazz(env), NULL);
@@ -418,11 +420,11 @@
static_cast<jobjectArray>(env->CallObjectMethod(obj,
method_id));
jni_generator::CheckException(env);
- return ScopedJavaLocalRef<jobjectArray>(env, ret);
+ 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() */
CHECK_CLAZZ(env, obj,
@@ -442,12 +444,12 @@
static_cast<jobjectArray>(env->CallObjectMethod(obj,
method_id));
jni_generator::CheckException(env);
- return ScopedJavaLocalRef<jobjectArray>(env, ret);
+ 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() */
CHECK_CLAZZ(env, obj,
TestJni_clazz(env), NULL);
@@ -466,12 +468,12 @@
env->CallObjectMethod(obj,
method_id);
jni_generator::CheckException(env);
- return ScopedJavaLocalRef<jobject>(env, ret);
+ 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() */
CHECK_CLAZZ(env, obj,
TestJni_clazz(env), NULL);
@@ -490,7 +492,7 @@
env->CallObjectMethod(obj,
method_id);
jni_generator::CheckException(env);
- return ScopedJavaLocalRef<jobject>(env, ret);
+ return base::android::ScopedJavaLocalRef<jobject>(env, ret);
}
// Step 3: RegisterNatives.
« no previous file with comments | « base/android/jni_generator/sample_for_tests.cc ('k') | base/android/jni_generator/testConstantsFromJavaP.golden » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698