Chromium Code Reviews| Index: net/base/multi_threaded_cert_verifier_unittest.cc |
| diff --git a/net/base/multi_threaded_cert_verifier_unittest.cc b/net/base/multi_threaded_cert_verifier_unittest.cc |
| index cb0a602985f3b6cca105af8b77aa5262551f677f..e32ec049c1721dad5ea2d41915303c6308eec0a7 100644 |
| --- a/net/base/multi_threaded_cert_verifier_unittest.cc |
| +++ b/net/base/multi_threaded_cert_verifier_unittest.cc |
| @@ -9,6 +9,7 @@ |
| #include "base/format_macros.h" |
| #include "base/stringprintf.h" |
| #include "net/base/cert_test_util.h" |
| +#include "net/base/cert_verify_result.h" |
| #include "net/base/net_errors.h" |
| #include "net/base/net_log.h" |
| #include "net/base/test_completion_callback.h" |
| @@ -23,11 +24,30 @@ void FailTest(int /* result */) { |
| FAIL(); |
| } |
| +class MockCertVerifyProc : public MultiThreadedCertVerifier::VerifyProc { |
| + public: |
| + MockCertVerifyProc() {} |
| + |
| + virtual int Verify(X509Certificate* certificate, |
|
wtc
2012/03/06 23:10:14
Nit: shorten 'certificate' to 'cert'?
|
| + const std::string& hostname, |
| + int flags, |
| + CRLSet* crl_set, |
| + CertVerifyResult* verify_result) OVERRIDE { |
| + verify_result->Reset(); |
| + verify_result->verified_cert = certificate; |
| + verify_result->cert_status = CERT_STATUS_COMMON_NAME_INVALID; |
| + return ERR_CERT_COMMON_NAME_INVALID; |
| + } |
| + |
| + protected: |
| + virtual ~MockCertVerifyProc() {} |
| +}; |
| + |
| } // namespace; |
| // Tests a cache hit, which should result in synchronous completion. |
| TEST(MultiThreadedCertVerifierTest, CacheHit) { |
| - MultiThreadedCertVerifier verifier; |
| + MultiThreadedCertVerifier verifier(new MockCertVerifyProc); |
| FilePath certs_dir = GetTestCertsDirectory(); |
| scoped_refptr<X509Certificate> test_cert( |
| @@ -66,7 +86,7 @@ TEST(MultiThreadedCertVerifierTest, CacheHit) { |
| // certificates. These should be treated as different certificate chains even |
| // though the two X509Certificate objects contain the same server certificate. |
| TEST(MultiThreadedCertVerifierTest, DifferentCACerts) { |
| - MultiThreadedCertVerifier verifier; |
| + MultiThreadedCertVerifier verifier(new MockCertVerifyProc); |
| FilePath certs_dir = GetTestCertsDirectory(); |
| @@ -126,7 +146,7 @@ TEST(MultiThreadedCertVerifierTest, DifferentCACerts) { |
| // Tests an inflight join. |
| TEST(MultiThreadedCertVerifierTest, InflightJoin) { |
| - MultiThreadedCertVerifier verifier; |
| + MultiThreadedCertVerifier verifier(new MockCertVerifyProc); |
| FilePath certs_dir = GetTestCertsDirectory(); |
| scoped_refptr<X509Certificate> test_cert( |
| @@ -161,7 +181,7 @@ TEST(MultiThreadedCertVerifierTest, InflightJoin) { |
| // Tests that the callback of a canceled request is never made. |
| TEST(MultiThreadedCertVerifierTest, CancelRequest) { |
| - MultiThreadedCertVerifier verifier; |
| + MultiThreadedCertVerifier verifier(new MockCertVerifyProc); |
| FilePath certs_dir = GetTestCertsDirectory(); |
| scoped_refptr<X509Certificate> test_cert( |
| @@ -196,7 +216,7 @@ TEST(MultiThreadedCertVerifierTest, CancelRequest) { |
| // Tests that a canceled request is not leaked. |
| TEST(MultiThreadedCertVerifierTest, CancelRequestThenQuit) { |
| - MultiThreadedCertVerifier verifier; |
| + MultiThreadedCertVerifier verifier(new MockCertVerifyProc); |
| FilePath certs_dir = GetTestCertsDirectory(); |
| scoped_refptr<X509Certificate> test_cert( |