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

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

Issue 1288183004: jni_generator: Make all object-returning natives return ScopedJavaLocalRef. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add some newlines for readability 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
Index: base/android/jni_generator/testNatives.golden
diff --git a/base/android/jni_generator/testNatives.golden b/base/android/jni_generator/testNatives.golden
index 64f76c10d8931f03d07fc1475ced52bacffe4492..51bd6f0b6186ca64990f2c54a28384db840fc4c6 100644
--- a/base/android/jni_generator/testNatives.golden
+++ b/base/android/jni_generator/testNatives.golden
@@ -55,13 +55,14 @@ static jlong Java_org_chromium_TestJni_nativeAddBookmark(JNIEnv* env,
return native->AddBookmark(env, jcaller, url, title, isFolder, parentId);
}
-static jstring GetDomainAndRegistry(JNIEnv* env, jclass jcaller,
+static ScopedJavaLocalRef<jstring> GetDomainAndRegistry(JNIEnv* env, jclass
+ jcaller,
jstring url);
static jstring Java_org_chromium_TestJni_nativeGetDomainAndRegistry(JNIEnv* env,
jclass jcaller,
jstring url) {
- return GetDomainAndRegistry(env, jcaller, url);
+ return GetDomainAndRegistry(env, jcaller, url).Release();
}
static void CreateHistoricalTabFromState(JNIEnv* env, jclass jcaller,
@@ -75,21 +76,23 @@ static void Java_org_chromium_TestJni_nativeCreateHistoricalTabFromState(JNIEnv*
return CreateHistoricalTabFromState(env, jcaller, state, tab_index);
}
-static jbyteArray GetStateAsByteArray(JNIEnv* env, jobject jcaller,
+static ScopedJavaLocalRef<jbyteArray> GetStateAsByteArray(JNIEnv* env, jobject
+ jcaller,
jobject view);
static jbyteArray Java_org_chromium_TestJni_nativeGetStateAsByteArray(JNIEnv*
env, jobject jcaller,
jobject view) {
- return GetStateAsByteArray(env, jcaller, view);
+ return GetStateAsByteArray(env, jcaller, view).Release();
}
-static jobjectArray GetAutofillProfileGUIDs(JNIEnv* env, jclass jcaller);
+static ScopedJavaLocalRef<jobjectArray> GetAutofillProfileGUIDs(JNIEnv* env,
+ jclass jcaller);
static jobjectArray
Java_org_chromium_TestJni_nativeGetAutofillProfileGUIDs(JNIEnv* env, jclass
jcaller) {
- return GetAutofillProfileGUIDs(env, jcaller);
+ return GetAutofillProfileGUIDs(env, jcaller).Release();
}
static void SetRecognitionResults(JNIEnv* env, jobject jcaller,
@@ -129,11 +132,11 @@ static jint Java_org_chromium_TestJni_nativeFindAll(JNIEnv* env, jobject
return FindAll(env, jcaller, find);
}
-static jobject GetInnerClass(JNIEnv* env, jclass jcaller);
+static ScopedJavaLocalRef<jobject> GetInnerClass(JNIEnv* env, jclass jcaller);
static jobject Java_org_chromium_TestJni_nativeGetInnerClass(JNIEnv* env, jclass
jcaller) {
- return GetInnerClass(env, jcaller);
+ return GetInnerClass(env, jcaller).Release();
}
static jobject Java_org_chromium_TestJni_nativeQueryBitmap(JNIEnv* env,

Powered by Google App Engine
This is Rietveld 408576698