Chromium Code Reviews| 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 f1d60f069a9a02ee4c37c89946a136dc2aa0e2c3..848dec55fa3f31326fc3e7ce250566363e8701de 100644 |
| --- a/net/quic/test_tools/crypto_test_utils_chromium.cc |
| +++ b/net/quic/test_tools/crypto_test_utils_chromium.cc |
| @@ -6,8 +6,10 @@ |
| #include "base/memory/ref_counted.h" |
| #include "base/memory/scoped_ptr.h" |
| +#include "net/base/net_errors.h" |
| #include "net/base/test_data_directory.h" |
| #include "net/cert/cert_verifier.h" |
| +#include "net/cert/mock_cert_verifier.h" |
| #include "net/cert/test_root_certs.h" |
| #include "net/cert/x509_certificate.h" |
| #include "net/http/transport_security_state.h" |
| @@ -108,15 +110,23 @@ class FakeProofVerifier : public ProofVerifier { |
| // static |
| ProofSource* CryptoTestUtils::ProofSourceForTesting() { |
| - return new ProofSourceChromium(); |
| + ProofSourceChromium* source = new ProofSourceChromium(); |
| + base::FilePath certs_dir = GetTestCertsDirectory(); |
| + CHECK( |
| + source->Initialize(certs_dir.Append("quic_test.example.com.crt"), |
| + certs_dir.Append("quic_test.example.com.key.pkcs8"))); |
| + return source; |
| } |
| // static |
| ProofVerifier* CryptoTestUtils::ProofVerifierForTesting() { |
| - TestProofVerifierChromium* proof_verifier = new TestProofVerifierChromium( |
| - CertVerifier::CreateDefault(), new TransportSecurityState, |
| - "quic_root.crt"); |
| - return proof_verifier; |
| + // TODO(rch): use an actual CertVerifier here. Need to enable |
| + // CryptoTestUtils::HandshakeWithFakeClient to wait for async |
| + // proof verification. |
| + MockCertVerifier* cert_verifier = new MockCertVerifier(); |
| + cert_verifier->set_default_result(OK); |
| + return new TestProofVerifierChromium( |
| + cert_verifier, new TransportSecurityState, "quic_root.crt"); |
|
davidben
2015/08/25 19:33:02
[Not for this CL, but TestProofVerifierChromium sh
Ryan Hamilton
2015/08/26 18:52:14
TODO added. Thanks.
|
| } |
| // static |