| 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 e2ff0420920d2712c6feff1b439510e12e59418e..2deb346e38f686452b15e7571e440978ce361c73 100644
|
| --- a/net/quic/test_tools/crypto_test_utils_chromium.cc
|
| +++ b/net/quic/test_tools/crypto_test_utils_chromium.cc
|
| @@ -10,6 +10,7 @@
|
| #include "net/cert/cert_verifier.h"
|
| #include "net/cert/test_root_certs.h"
|
| #include "net/cert/x509_certificate.h"
|
| +#include "net/http/transport_security_state.h"
|
| #include "net/quic/crypto/proof_source_chromium.h"
|
| #include "net/quic/crypto/proof_verifier_chromium.h"
|
| #include "net/test/cert_test_util.h"
|
| @@ -23,9 +24,11 @@ namespace {
|
| class TestProofVerifierChromium : public ProofVerifierChromium {
|
| public:
|
| TestProofVerifierChromium(CertVerifier* cert_verifier,
|
| + TransportSecurityState* transport_security_state,
|
| const std::string& cert_file)
|
| - : ProofVerifierChromium(cert_verifier),
|
| - cert_verifier_(cert_verifier) {
|
| + : ProofVerifierChromium(cert_verifier, transport_security_state),
|
| + cert_verifier_(cert_verifier),
|
| + transport_security_state_(transport_security_state) {
|
| // Load and install the root for the validated chain.
|
| scoped_refptr<X509Certificate> root_cert =
|
| ImportCertFromFile(GetTestCertsDirectory(), cert_file);
|
| @@ -36,6 +39,7 @@ class TestProofVerifierChromium : public ProofVerifierChromium {
|
| private:
|
| ScopedTestRoot scoped_root_;
|
| scoped_ptr<CertVerifier> cert_verifier_;
|
| + scoped_ptr<TransportSecurityState> transport_security_state_;
|
| };
|
|
|
| const char kLeafCert[] = "leaf";
|
| @@ -109,8 +113,10 @@ ProofSource* CryptoTestUtils::ProofSourceForTesting() {
|
|
|
| // static
|
| ProofVerifier* CryptoTestUtils::ProofVerifierForTesting() {
|
| - TestProofVerifierChromium* proof_verifier = new TestProofVerifierChromium(
|
| - CertVerifier::CreateDefault(), "quic_root.crt");
|
| + TestProofVerifierChromium* proof_verifier =
|
| + new TestProofVerifierChromium(CertVerifier::CreateDefault(),
|
| + new TransportSecurityState,
|
| + "quic_root.crt");
|
| return proof_verifier;
|
| }
|
|
|
|
|