| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 "net/cert/x509_util_android.h" | 5 #include "net/cert/x509_util_android.h" |
| 6 | 6 |
| 7 #include "base/android/build_info.h" | 7 #include "base/android/build_info.h" |
| 8 #include "base/android/context_utils.h" | |
| 9 #include "base/metrics/histogram_macros.h" | 8 #include "base/metrics/histogram_macros.h" |
| 10 #include "jni/X509Util_jni.h" | 9 #include "jni/X509Util_jni.h" |
| 11 #include "net/cert/cert_database.h" | 10 #include "net/cert/cert_database.h" |
| 12 | 11 |
| 13 using base::android::JavaParamRef; | 12 using base::android::JavaParamRef; |
| 14 | 13 |
| 15 namespace net { | 14 namespace net { |
| 16 | 15 |
| 17 void NotifyKeyChainChanged(JNIEnv* env, const JavaParamRef<jclass>& clazz) { | 16 void NotifyKeyChainChanged(JNIEnv* env, const JavaParamRef<jclass>& clazz) { |
| 18 CertDatabase::GetInstance()->OnAndroidKeyChainChanged(); | 17 CertDatabase::GetInstance()->OnAndroidKeyChainChanged(); |
| 19 } | 18 } |
| 20 | 19 |
| 21 void RecordCertVerifyCapabilitiesHistogram(JNIEnv* env, | 20 void RecordCertVerifyCapabilitiesHistogram(JNIEnv* env, |
| 22 const JavaParamRef<jclass>& clazz, | 21 const JavaParamRef<jclass>& clazz, |
| 23 jboolean found_system_trust_roots) { | 22 jboolean found_system_trust_roots) { |
| 24 // Only record the histogram for 4.2 and up. Before 4.2, the platform doesn't | 23 // Only record the histogram for 4.2 and up. Before 4.2, the platform doesn't |
| 25 // return the certificate chain anyway. | 24 // return the certificate chain anyway. |
| 26 if (base::android::BuildInfo::GetInstance()->sdk_int() >= 17) { | 25 if (base::android::BuildInfo::GetInstance()->sdk_int() >= 17) { |
| 27 UMA_HISTOGRAM_BOOLEAN("Net.FoundSystemTrustRootsAndroid", | 26 UMA_HISTOGRAM_BOOLEAN("Net.FoundSystemTrustRootsAndroid", |
| 28 found_system_trust_roots); | 27 found_system_trust_roots); |
| 29 } | 28 } |
| 30 } | 29 } |
| 31 | 30 |
| 32 bool RegisterX509Util(JNIEnv* env) { | 31 bool RegisterX509Util(JNIEnv* env) { |
| 33 return RegisterNativesImpl(env); | 32 return RegisterNativesImpl(env); |
| 34 } | 33 } |
| 35 | 34 |
| 36 } // net namespace | 35 } // net namespace |
| OLD | NEW |