| 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) {
|
|
|