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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/android/field_trial_list.h" 5 #include "base/android/field_trial_list.h"
6 6
7 #include <jni.h> 7 #include <jni.h>
8 8
9 #include "base/android/jni_string.h" 9 #include "base/android/jni_string.h"
10 #include "base/metrics/field_trial.h" 10 #include "base/metrics/field_trial.h"
11 #include "jni/FieldTrialList_jni.h" 11 #include "jni/FieldTrialList_jni.h"
12 12
13 using base::android::ConvertJavaStringToUTF8; 13 using base::android::ConvertJavaStringToUTF8;
14 using base::android::ConvertUTF8ToJavaString; 14 using base::android::ConvertUTF8ToJavaString;
15 15
16 static ScopedJavaLocalRef<jstring> FindFullName(JNIEnv* env, 16 static jstring FindFullName(JNIEnv* env,
17 jclass clazz, 17 jclass clazz,
18 jstring jtrial_name) { 18 jstring jtrial_name) {
19 std::string trial_name(ConvertJavaStringToUTF8(env, jtrial_name)); 19 std::string trial_name(ConvertJavaStringToUTF8(env, jtrial_name));
20 return ConvertUTF8ToJavaString( 20 return ConvertUTF8ToJavaString(
21 env, base::FieldTrialList::FindFullName(trial_name)); 21 env,
22 base::FieldTrialList::FindFullName(trial_name)).Release();
22 } 23 }
23 24
24 static jboolean TrialExists(JNIEnv* env, jclass clazz, jstring jtrial_name) { 25 static jboolean TrialExists(JNIEnv* env, jclass clazz, jstring jtrial_name) {
25 std::string trial_name(ConvertJavaStringToUTF8(env, jtrial_name)); 26 std::string trial_name(ConvertJavaStringToUTF8(env, jtrial_name));
26 return base::FieldTrialList::TrialExists(trial_name); 27 return base::FieldTrialList::TrialExists(trial_name);
27 } 28 }
28 29
29 namespace base { 30 namespace base {
30 namespace android { 31 namespace android {
31 32
32 bool RegisterFieldTrialList(JNIEnv* env) { 33 bool RegisterFieldTrialList(JNIEnv* env) {
33 return RegisterNativesImpl(env); 34 return RegisterNativesImpl(env);
34 } 35 }
35 36
36 } // namespace android 37 } // namespace android
37 } // namespace base 38 } // namespace base
OLDNEW
« 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