| Index: net/cert/internal/trust_store_collection_unittest.cc
|
| diff --git a/net/cert/internal/trust_store_collection_unittest.cc b/net/cert/internal/trust_store_collection_unittest.cc
|
| index c9cd85ccab8fecd18e8d200f54e601c3cce0b511..198988e78c6a2d14c75609a44f529c9ceb181d1b 100644
|
| --- a/net/cert/internal/trust_store_collection_unittest.cc
|
| +++ b/net/cert/internal/trust_store_collection_unittest.cc
|
| @@ -16,13 +16,14 @@ class TrustStoreCollectionTest : public testing::Test {
|
| public:
|
| void SetUp() override {
|
| ParsedCertificateList chain;
|
| - bool unused_verify_result;
|
| - der::GeneralizedTime unused_time;
|
| - std::string unused_errors;
|
|
|
| + VerifyCertChainTest test;
|
| ReadVerifyCertChainTestFromFile(
|
| "net/data/verify_certificate_chain_unittest/key-rollover-oldchain.pem",
|
| - &chain, &oldroot_, &unused_time, &unused_verify_result, &unused_errors);
|
| + &test);
|
| + chain = test.chain;
|
| + oldroot_ = test.trust_anchor;
|
| +
|
| ASSERT_EQ(2U, chain.size());
|
| target_ = chain[0];
|
| oldintermediate_ = chain[1];
|
| @@ -30,12 +31,12 @@ class TrustStoreCollectionTest : public testing::Test {
|
| ASSERT_TRUE(oldintermediate_);
|
| ASSERT_TRUE(oldroot_);
|
|
|
| - scoped_refptr<TrustAnchor> unused_root;
|
| ReadVerifyCertChainTestFromFile(
|
| "net/data/verify_certificate_chain_unittest/"
|
| "key-rollover-longrolloverchain.pem",
|
| - &chain, &unused_root, &unused_time, &unused_verify_result,
|
| - &unused_errors);
|
| + &test);
|
| + chain = test.chain;
|
| +
|
| ASSERT_EQ(4U, chain.size());
|
| newintermediate_ = chain[1];
|
| newroot_ = TrustAnchor::CreateFromCertificateNoConstraints(chain[2]);
|
|
|