Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "components/variations/android/variations_associated_data_android.h" | 5 #include "components/variations/android/variations_associated_data_android.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "components/variations/variations_associated_data.h" | 10 #include "components/variations/variations_associated_data.h" |
| 11 #include "components/variations/variations_http_header_provider.h" | 11 #include "components/variations/variations_http_header_provider.h" |
| 12 #include "jni/VariationsAssociatedData_jni.h" | 12 #include "jni/VariationsAssociatedData_jni.h" |
| 13 | 13 |
| 14 using base::android::ConvertJavaStringToUTF8; | 14 using base::android::ConvertJavaStringToUTF8; |
| 15 using base::android::ConvertUTF8ToJavaString; | 15 using base::android::ConvertUTF8ToJavaString; |
| 16 using base::android::JavaParamRef; | 16 using base::android::JavaParamRef; |
| 17 using base::android::ScopedJavaLocalRef; | 17 using base::android::ScopedJavaLocalRef; |
| 18 | 18 |
| 19 namespace variations { | 19 namespace variations { |
| 20 | 20 |
| 21 namespace android { | 21 namespace android { |
| 22 | 22 |
| 23 jint GetVariationParamByFeatureAsInt( | |
| 24 JNIEnv* env, | |
| 25 const JavaParamRef<jclass>& clazz, | |
| 26 const jlong jfeature, | |
| 27 const JavaParamRef<jstring>& jparam_name, | |
| 28 const jint jdefault_value) { | |
| 29 | |
| 30 base::Feature * feature = reinterpret_cast<base::Feature*>(jfeature); | |
| 31 if (feature == nullptr) { | |
| 32 return jdefault_value; | |
| 33 } | |
| 34 | |
| 35 std::string param_name(ConvertJavaStringToUTF8(env, jparam_name)); | |
| 36 int default_value = static_cast<int>(jdefault_value); | |
| 37 | |
|
rkaplow
2017/01/31 18:17:44
this recently got deprecated to the base:: version
amp
2017/01/31 18:41:43
Acknowledged.
I'll update to the non-deprecated c
| |
| 38 return variations::GetVariationParamByFeatureAsInt( | |
| 39 *feature, param_name, default_value); | |
| 40 } | |
| 41 | |
| 23 ScopedJavaLocalRef<jstring> GetVariationParamValue( | 42 ScopedJavaLocalRef<jstring> GetVariationParamValue( |
| 24 JNIEnv* env, | 43 JNIEnv* env, |
| 25 const JavaParamRef<jclass>& clazz, | 44 const JavaParamRef<jclass>& clazz, |
| 26 const JavaParamRef<jstring>& jtrial_name, | 45 const JavaParamRef<jstring>& jtrial_name, |
| 27 const JavaParamRef<jstring>& jparam_name) { | 46 const JavaParamRef<jstring>& jparam_name) { |
| 28 std::string trial_name(ConvertJavaStringToUTF8(env, jtrial_name)); | 47 std::string trial_name(ConvertJavaStringToUTF8(env, jtrial_name)); |
| 29 std::string param_name(ConvertJavaStringToUTF8(env, jparam_name)); | 48 std::string param_name(ConvertJavaStringToUTF8(env, jparam_name)); |
| 30 std::string param_value = | 49 std::string param_value = |
| 31 variations::GetVariationParamValue(trial_name, param_name); | 50 variations::GetVariationParamValue(trial_name, param_name); |
| 32 return ConvertUTF8ToJavaString(env, param_value); | 51 return ConvertUTF8ToJavaString(env, param_value); |
| 33 } | 52 } |
| 34 | 53 |
| 35 ScopedJavaLocalRef<jstring> GetFeedbackVariations( | 54 ScopedJavaLocalRef<jstring> GetFeedbackVariations( |
| 36 JNIEnv* env, | 55 JNIEnv* env, |
| 37 const JavaParamRef<jclass>& clazz) { | 56 const JavaParamRef<jclass>& clazz) { |
| 38 const std::string values = | 57 const std::string values = |
| 39 VariationsHttpHeaderProvider::GetInstance()->GetVariationsString(); | 58 VariationsHttpHeaderProvider::GetInstance()->GetVariationsString(); |
| 40 return ConvertUTF8ToJavaString(env, values); | 59 return ConvertUTF8ToJavaString(env, values); |
| 41 } | 60 } |
| 42 | 61 |
| 43 bool RegisterVariationsAssociatedData(JNIEnv* env) { | 62 bool RegisterVariationsAssociatedData(JNIEnv* env) { |
| 44 return RegisterNativesImpl(env); | 63 return RegisterNativesImpl(env); |
| 45 } | 64 } |
| 46 | 65 |
| 47 } // namespace android | 66 } // namespace android |
| 48 | 67 |
| 49 } // namespace variations | 68 } // namespace variations |
| OLD | NEW |