| Index: net/cert/internal/verify_certificate_chain_unittest.cc
|
| diff --git a/net/cert/internal/verify_certificate_chain_unittest.cc b/net/cert/internal/verify_certificate_chain_unittest.cc
|
| index b8572964af810b397060e18a32d537cced705414..d886148ea8356759ce894741c8166c3532475150 100644
|
| --- a/net/cert/internal/verify_certificate_chain_unittest.cc
|
| +++ b/net/cert/internal/verify_certificate_chain_unittest.cc
|
| @@ -12,23 +12,19 @@ namespace net {
|
|
|
| namespace {
|
|
|
| -class VerifyCertificateChainAssumingTrustedRootDelegate {
|
| +class VerifyCertificateChainDelegate {
|
| public:
|
| static void Verify(const ParsedCertificateList& chain,
|
| - const ParsedCertificateList& roots,
|
| + const TrustAnchors& anchors,
|
| const der::GeneralizedTime& time,
|
| bool expected_result) {
|
| - TrustStore trust_store;
|
| - ASSERT_EQ(1U, roots.size());
|
| - trust_store.AddTrustedCertificate(roots[0]);
|
| -
|
| - ParsedCertificateList full_chain(chain);
|
| - full_chain.push_back(roots[0]);
|
| + ASSERT_EQ(1U, anchors.size());
|
| + ASSERT_TRUE(anchors.front().get());
|
|
|
| SimpleSignaturePolicy signature_policy(1024);
|
|
|
| - bool result = VerifyCertificateChainAssumingTrustedRoot(
|
| - full_chain, trust_store, &signature_policy, time);
|
| + bool result = VerifyCertificateChain(chain, anchors.front().get(),
|
| + &signature_policy, time);
|
|
|
| ASSERT_EQ(expected_result, result);
|
| }
|
| @@ -36,9 +32,8 @@ class VerifyCertificateChainAssumingTrustedRootDelegate {
|
|
|
| } // namespace
|
|
|
| -INSTANTIATE_TYPED_TEST_CASE_P(
|
| - VerifyCertificateChainAssumingTrustedRoot,
|
| - VerifyCertificateChainSingleRootTest,
|
| - VerifyCertificateChainAssumingTrustedRootDelegate);
|
| +INSTANTIATE_TYPED_TEST_CASE_P(VerifyCertificateChain,
|
| + VerifyCertificateChainSingleRootTest,
|
| + VerifyCertificateChainDelegate);
|
|
|
| } // namespace net
|
|
|