base/android/field_trial_list.cc - Issue 1288183004: 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: base/android/field_trial_list.cc

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

« no previous file with comments | « base/android/command_line_android.cc ('k') | base/android/jni_generator/golden_sample_for_tests_jni.h » ('j') | chrome/browser/signin/oauth2_token_service_delegate_android.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/android/field_trial_list.cc

diff --git a/base/android/field_trial_list.cc b/base/android/field_trial_list.cc

index 9cb38d2910624e7b4ce529d71503c7c935581ab2..3ff3811b0b7b730f1630dbd4162154af91b209e4 100644

--- a/base/android/field_trial_list.cc

+++ b/base/android/field_trial_list.cc

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

using base::android::ConvertJavaStringToUTF8;

using base::android::ConvertUTF8ToJavaString;

-static jstring FindFullName(JNIEnv* env,

- jclass clazz,

- jstring jtrial_name) {

+static ScopedJavaLocalRef<jstring> FindFullName(JNIEnv* env,

+ jclass clazz,

+ jstring jtrial_name) {

std::string trial_name(ConvertJavaStringToUTF8(env, jtrial_name));

return ConvertUTF8ToJavaString(

- env,

- base::FieldTrialList::FindFullName(trial_name)).Release();

+ env, base::FieldTrialList::FindFullName(trial_name));

}

static jboolean TrialExists(JNIEnv* env, jclass clazz, jstring jtrial_name) {