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

Side by Side Diff: net/cert/x509_util_android.cc

Issue 144153002: Follow-up changes to Android certificate verification logic. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase and fix X509UtilTest. Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « net/cert/cert_verify_proc_android.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/jni_android.h" 8 #include "base/android/jni_android.h"
9 #include "base/metrics/histogram.h"
8 #include "jni/X509Util_jni.h" 10 #include "jni/X509Util_jni.h"
9 #include "net/cert/cert_database.h" 11 #include "net/cert/cert_database.h"
10 12
11 namespace net { 13 namespace net {
12 14
13 void NotifyKeyChainChanged(JNIEnv* env, jclass clazz) { 15 void NotifyKeyChainChanged(JNIEnv* env, jclass clazz) {
14 CertDatabase::GetInstance()->OnAndroidKeyChainChanged(); 16 CertDatabase::GetInstance()->OnAndroidKeyChainChanged();
15 } 17 }
16 18
19 void RecordCertVerifyCapabilitiesHistogram(JNIEnv* env,
20 jclass clazz,
21 jboolean found_system_trust_roots) {
22 // Only record the histogram for 4.2 and up. Before 4.2, the platform doesn't
23 // return the certificate chain anyway.
24 if (base::android::BuildInfo::GetInstance()->sdk_int() >= 17) {
25 UMA_HISTOGRAM_BOOLEAN("Net.FoundSystemTrustRootsAndroid",
26 found_system_trust_roots);
27 }
28 }
29
17 jobject GetApplicationContext(JNIEnv* env, jclass clazz) { 30 jobject GetApplicationContext(JNIEnv* env, jclass clazz) {
18 return base::android::GetApplicationContext(); 31 return base::android::GetApplicationContext();
19 } 32 }
20 33
21 bool RegisterX509Util(JNIEnv* env) { 34 bool RegisterX509Util(JNIEnv* env) {
22 return RegisterNativesImpl(env); 35 return RegisterNativesImpl(env);
23 } 36 }
24 37
25 } // net namespace 38 } // net namespace
OLDNEW
« no previous file with comments | « net/cert/cert_verify_proc_android.cc ('k') | tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698