| 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,
|
|
|