| Index: net/cert/cert_verifier_unittest.cc
|
| diff --git a/net/cert/cert_verifier_unittest.cc b/net/cert/cert_verifier_unittest.cc
|
| index 5bd77a09dc0af6ec386b0cd60ff2fdb523e8924f..3b03416da2b21f298c1066757346a5db69039132 100644
|
| --- a/net/cert/cert_verifier_unittest.cc
|
| +++ b/net/cert/cert_verifier_unittest.cc
|
| @@ -51,62 +51,62 @@ TEST(CertVerifierTest, RequestParamsComparators) {
|
| } tests[] = {
|
| {
|
| // Test for basic equivalence.
|
| - CertVerifier::RequestParams(ok_cert.get(), "www.example.test", 0,
|
| + CertVerifier::RequestParams(ok_cert, "www.example.test", 0,
|
| std::string(), empty_list),
|
| - CertVerifier::RequestParams(ok_cert.get(), "www.example.test", 0,
|
| + CertVerifier::RequestParams(ok_cert, "www.example.test", 0,
|
| std::string(), empty_list),
|
| 0,
|
| },
|
| {
|
| // Test that different certificates but with the same CA and for
|
| // the same host are different validation keys.
|
| - CertVerifier::RequestParams(ok_cert.get(), "www.example.test", 0,
|
| + CertVerifier::RequestParams(ok_cert, "www.example.test", 0,
|
| std::string(), empty_list),
|
| - CertVerifier::RequestParams(expired_cert.get(), "www.example.test", 0,
|
| + CertVerifier::RequestParams(expired_cert, "www.example.test", 0,
|
| std::string(), empty_list),
|
| -1,
|
| },
|
| {
|
| // Test that the same EE certificate for the same host, but with
|
| // different chains are different validation keys.
|
| - CertVerifier::RequestParams(ok_cert.get(), "www.example.test", 0,
|
| + CertVerifier::RequestParams(ok_cert, "www.example.test", 0,
|
| + std::string(), empty_list),
|
| + CertVerifier::RequestParams(combined_cert, "www.example.test", 0,
|
| std::string(), empty_list),
|
| - CertVerifier::RequestParams(combined_cert.get(), "www.example.test",
|
| - 0, std::string(), empty_list),
|
| 1,
|
| },
|
| {
|
| // The same certificate, with the same chain, but for different
|
| // hosts are different validation keys.
|
| - CertVerifier::RequestParams(ok_cert.get(), "www1.example.test", 0,
|
| + CertVerifier::RequestParams(ok_cert, "www1.example.test", 0,
|
| std::string(), empty_list),
|
| - CertVerifier::RequestParams(ok_cert.get(), "www2.example.test", 0,
|
| + CertVerifier::RequestParams(ok_cert, "www2.example.test", 0,
|
| std::string(), empty_list),
|
| -1,
|
| },
|
| {
|
| // The same certificate, chain, and host, but with different flags
|
| // are different validation keys.
|
| - CertVerifier::RequestParams(ok_cert.get(), "www.example.test",
|
| + CertVerifier::RequestParams(ok_cert, "www.example.test",
|
| CertVerifier::VERIFY_EV_CERT,
|
| std::string(), empty_list),
|
| - CertVerifier::RequestParams(ok_cert.get(), "www.example.test", 0,
|
| + CertVerifier::RequestParams(ok_cert, "www.example.test", 0,
|
| std::string(), empty_list),
|
| 1,
|
| },
|
| {
|
| // Different additional_trust_anchors.
|
| - CertVerifier::RequestParams(ok_cert.get(), "www.example.test", 0,
|
| + CertVerifier::RequestParams(ok_cert, "www.example.test", 0,
|
| std::string(), empty_list),
|
| - CertVerifier::RequestParams(ok_cert.get(), "www.example.test", 0,
|
| + CertVerifier::RequestParams(ok_cert, "www.example.test", 0,
|
| std::string(), test_list),
|
| -1,
|
| },
|
| {
|
| // Different OCSP responses.
|
| - CertVerifier::RequestParams(ok_cert.get(), "www.example.test", 0,
|
| + CertVerifier::RequestParams(ok_cert, "www.example.test", 0,
|
| "ocsp response", empty_list),
|
| - CertVerifier::RequestParams(ok_cert.get(), "www.example.test", 0,
|
| + CertVerifier::RequestParams(ok_cert, "www.example.test", 0,
|
| std::string(), empty_list),
|
| -1,
|
| },
|
|
|