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