| Index: net/quic/test_tools/crypto_test_utils_chromium.cc
|
| diff --git a/net/quic/test_tools/crypto_test_utils_chromium.cc b/net/quic/test_tools/crypto_test_utils_chromium.cc
|
| index 121db431beeed29a26ad3d0ce23dd8d011feaf14..2c04b812a17daaf1970139ca37506ec0597e3b30 100644
|
| --- a/net/quic/test_tools/crypto_test_utils_chromium.cc
|
| +++ b/net/quic/test_tools/crypto_test_utils_chromium.cc
|
| @@ -18,6 +18,7 @@
|
| #include "net/cert/cert_status_flags.h"
|
| #include "net/cert/cert_verifier.h"
|
| #include "net/cert/cert_verify_result.h"
|
| +#include "net/cert/ct_policy_enforcer.h"
|
| #include "net/cert/ct_verifier.h"
|
| #include "net/cert/mock_cert_verifier.h"
|
| #include "net/cert/multi_log_ct_verifier.h"
|
| @@ -50,14 +51,16 @@ class TestProofVerifierChromium : public ProofVerifierChromium {
|
| std::unique_ptr<CertVerifier> cert_verifier,
|
| std::unique_ptr<TransportSecurityState> transport_security_state,
|
| std::unique_ptr<CTVerifier> cert_transparency_verifier,
|
| + std::unique_ptr<CTPolicyEnforcer> ct_policy_enforcer,
|
| const std::string& cert_file)
|
| : ProofVerifierChromium(cert_verifier.get(),
|
| - nullptr,
|
| + ct_policy_enforcer.get(),
|
| transport_security_state.get(),
|
| cert_transparency_verifier.get()),
|
| cert_verifier_(std::move(cert_verifier)),
|
| transport_security_state_(std::move(transport_security_state)),
|
| - cert_transparency_verifier_(std::move(cert_transparency_verifier)) {
|
| + cert_transparency_verifier_(std::move(cert_transparency_verifier)),
|
| + ct_policy_enforcer_(std::move(ct_policy_enforcer)) {
|
| // Load and install the root for the validated chain.
|
| scoped_refptr<X509Certificate> root_cert =
|
| ImportCertFromFile(GetTestCertsDirectory(), cert_file);
|
| @@ -73,6 +76,7 @@ class TestProofVerifierChromium : public ProofVerifierChromium {
|
| std::unique_ptr<CertVerifier> cert_verifier_;
|
| std::unique_ptr<TransportSecurityState> transport_security_state_;
|
| std::unique_ptr<CTVerifier> cert_transparency_verifier_;
|
| + std::unique_ptr<CTPolicyEnforcer> ct_policy_enforcer_;
|
| };
|
|
|
| } // namespace
|
| @@ -104,11 +108,13 @@ ProofVerifier* ProofVerifierForTestingInternal(bool use_real_proof_verifier) {
|
| if (use_real_proof_verifier) {
|
| return new TestProofVerifierChromium(
|
| std::move(cert_verifier), base::WrapUnique(new TransportSecurityState),
|
| - base::WrapUnique(new MultiLogCTVerifier), "quic_root.crt");
|
| + base::WrapUnique(new MultiLogCTVerifier),
|
| + base::WrapUnique(new CTPolicyEnforcer), "quic_root.crt");
|
| }
|
| return new TestProofVerifierChromium(
|
| std::move(cert_verifier), base::WrapUnique(new TransportSecurityState),
|
| - base::WrapUnique(new MultiLogCTVerifier), "quic_root.crt");
|
| + base::WrapUnique(new MultiLogCTVerifier),
|
| + base::WrapUnique(new CTPolicyEnforcer), "quic_root.crt");
|
| }
|
|
|
| // static
|
|
|