chrome/browser/autofill/android/personal_data_manager_android.cc - Issue 1308363003: Revert of jni_generator: Make all object-returning natives return ScopedJavaLocalRef.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/autofill/android/personal_data_manager_android.cc

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 | « chrome/browser/android/web_contents_factory.cc ('k') | chrome/browser/dom_distiller/dom_distiller_service_factory_android.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/autofill/android/personal_data_manager_android.cc

diff --git a/chrome/browser/autofill/android/personal_data_manager_android.cc b/chrome/browser/autofill/android/personal_data_manager_android.cc

index b4ceaaf3f7ea1e35af72573afa6fce53a2ba85db..9a176dd18dbb0fc657f959b8cf8fe5f69cc06687 100644

--- a/chrome/browser/autofill/android/personal_data_manager_android.cc

+++ b/chrome/browser/autofill/android/personal_data_manager_android.cc

@@ -336,13 +336,12 @@

// Returns an ISO 3166-1-alpha-2 country code for a |jcountry_name| using

// the application locale, or an empty string.

-static ScopedJavaLocalRef<jstring> ToCountryCode(JNIEnv* env,

- jclass clazz,

- jstring jcountry_name) {

+static jstring ToCountryCode(JNIEnv* env, jclass clazz, jstring jcountry_name) {

return ConvertUTF8ToJavaString(

- env, AutofillCountry::GetCountryCode(

- base::android::ConvertJavaStringToUTF16(env, jcountry_name),

- g_browser_process->GetApplicationLocale()));

+ env,

+ AutofillCountry::GetCountryCode(

+ base::android::ConvertJavaStringToUTF16(env, jcountry_name),

+ g_browser_process->GetApplicationLocale())).Release();

}

static jlong Init(JNIEnv* env, jobject obj) {