diff options
Diffstat (limited to 'chromium/net/cert/ct_policy_enforcer.cc')
| -rw-r--r-- | chromium/net/cert/ct_policy_enforcer.cc | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/chromium/net/cert/ct_policy_enforcer.cc b/chromium/net/cert/ct_policy_enforcer.cc index a4e1e818c41..42f631eaa53 100644 --- a/chromium/net/cert/ct_policy_enforcer.cc +++ b/chromium/net/cert/ct_policy_enforcer.cc @@ -27,7 +27,10 @@ #include "net/cert/signed_certificate_timestamp.h" #include "net/cert/x509_certificate.h" #include "net/cert/x509_certificate_net_log_param.h" -#include "net/log/net_log.h" +#include "net/log/net_log_capture_mode.h" +#include "net/log/net_log_event_type.h" +#include "net/log/net_log_parameters_callback.h" +#include "net/log/net_log_with_source.h" namespace net { @@ -380,7 +383,7 @@ ct::EVPolicyCompliance CertPolicyComplianceToEVPolicyCompliance( void CheckCTEVPolicyCompliance(X509Certificate* cert, const ct::EVCertsWhitelist* ev_whitelist, const ct::SCTList& verified_scts, - const BoundNetLog& net_log, + const NetLogWithSource& net_log, EVComplianceDetails* result) { result->status = CertPolicyComplianceToEVPolicyCompliance( CheckCertPolicyCompliance(*cert, verified_scts)); @@ -398,7 +401,7 @@ void CheckCTEVPolicyCompliance(X509Certificate* cert, ct::CertPolicyCompliance CTPolicyEnforcer::DoesConformToCertPolicy( X509Certificate* cert, const ct::SCTList& verified_scts, - const BoundNetLog& net_log) { + const NetLogWithSource& net_log) { // If the build is not timely, no certificate is considered compliant // with CT policy. The reasoning is that, for example, a log might // have been pulled and is no longer considered valid; thus, a client @@ -412,11 +415,12 @@ ct::CertPolicyCompliance CTPolicyEnforcer::DoesConformToCertPolicy( compliance = CheckCertPolicyCompliance(*cert, verified_scts); } - NetLog::ParametersCallback net_log_callback = + NetLogParametersCallback net_log_callback = base::Bind(&NetLogCertComplianceCheckResultCallback, base::Unretained(cert), build_timely, compliance); - net_log.AddEvent(NetLog::TYPE_CERT_CT_COMPLIANCE_CHECKED, net_log_callback); + net_log.AddEvent(NetLogEventType::CERT_CT_COMPLIANCE_CHECKED, + net_log_callback); return compliance; } @@ -425,7 +429,7 @@ ct::EVPolicyCompliance CTPolicyEnforcer::DoesConformToCTEVPolicy( X509Certificate* cert, const ct::EVCertsWhitelist* ev_whitelist, const ct::SCTList& verified_scts, - const BoundNetLog& net_log) { + const NetLogWithSource& net_log) { EVComplianceDetails details; // If the build is not timely, no certificate is considered compliant // with EV policy. The reasoning is that, for example, a log might @@ -440,11 +444,11 @@ ct::EVPolicyCompliance CTPolicyEnforcer::DoesConformToCTEVPolicy( &details); } - NetLog::ParametersCallback net_log_callback = + NetLogParametersCallback net_log_callback = base::Bind(&NetLogEVComplianceCheckResultCallback, base::Unretained(cert), base::Unretained(&details)); - net_log.AddEvent(NetLog::TYPE_EV_CERT_CT_COMPLIANCE_CHECKED, + net_log.AddEvent(NetLogEventType::EV_CERT_CT_COMPLIANCE_CHECKED, net_log_callback); if (!details.build_timely) |