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

Unified Diff: base/android/field_trial_list.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 | « base/android/command_line_android.cc ('k') | base/android/jni_generator/golden_sample_for_tests_jni.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 3ff3811b0b7b730f1630dbd4162154af91b209e4..9cb38d2910624e7b4ce529d71503c7c935581ab2 100644
--- a/base/android/field_trial_list.cc
+++ b/base/android/field_trial_list.cc
@@ -13,12 +13,13 @@
using base::android::ConvertJavaStringToUTF8;
using base::android::ConvertUTF8ToJavaString;
-static ScopedJavaLocalRef<jstring> FindFullName(JNIEnv* env,
- jclass clazz,
- jstring jtrial_name) {
+static 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));
+ env,
+ base::FieldTrialList::FindFullName(trial_name)).Release();
}
static jboolean TrialExists(JNIEnv* env, jclass clazz, jstring jtrial_name) {
« no previous file with comments | « base/android/command_line_android.cc ('k') | base/android/jni_generator/golden_sample_for_tests_jni.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698