Refactor VerifyCertificateChain test data to include a key purpose

net/cert/internal/trust_store_nss_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/cert/internal/trust_store_nss.h"
 
 #include <cert.h>
 #include <certdb.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "crypto/scoped_test_nss_db.h"
 #include "net/cert/internal/test_helpers.h"
 #include "net/cert/scoped_nss_types.h"
 #include "net/cert/x509_certificate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 class TrustStoreNSSTest : public testing::Test {
  public:
   void SetUp() override {
     ASSERT_TRUE(test_nssdb_.is_open());
 
+    VerifyCertChainTest test;
     ParsedCertificateList chain;
-    bool unused_verify_result;
-    der::GeneralizedTime unused_time;
-    std::string unused_errors;
-
     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];
     ASSERT_TRUE(target_);
     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]);
     newrootrollover_ = chain[3];
     ASSERT_TRUE(newintermediate_);
     ASSERT_TRUE(newroot_);
     ASSERT_TRUE(newrootrollover_);
 
     trust_store_nss_.reset(new TrustStoreNSS(trustSSL));
   }
@@ skipping 137 matching lines @@
   TrustCert(newroot_.get());
   EXPECT_TRUE(TrustStoreContains(target_, TrustAnchors()));
   EXPECT_TRUE(TrustStoreContains(newintermediate_, {newroot_, oldroot_}));
   EXPECT_TRUE(TrustStoreContains(oldintermediate_, {newroot_, oldroot_}));
   EXPECT_TRUE(TrustStoreContains(oldroot_->cert(), {newroot_, oldroot_}));
 }
 
 }  // namespace
 
 }  // namespace net