Make TrustStore into an interface, move impl to TrustStoreInMemory.

net/cert/internal/path_builder_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/path_builder.h"
 
 #include "base/base_paths.h"
 #include "base/cancelable_callback.h"
 #include "base/files/file_util.h"
 #include "base/location.h"
 #include "base/path_service.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/cert/internal/cert_issuer_source_static.h"
 #include "net/cert/internal/parsed_certificate.h"
 #include "net/cert/internal/signature_policy.h"
 #include "net/cert/internal/test_helpers.h"
-#include "net/cert/internal/trust_store.h"
+#include "net/cert/internal/trust_store_in_memory.h"
 #include "net/cert/internal/verify_certificate_chain.h"
 #include "net/cert/pem_tokenizer.h"
 #include "net/der/input.h"
 #include "net/test/cert_test_util.h"
 #include "net/test/test_certificate_data.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 using ::testing::_;
 using ::testing::Invoke;
+using ::testing::NiceMock;
+using ::testing::Return;
 using ::testing::SaveArg;
+using ::testing::SetArgPointee;
 using ::testing::StrictMock;
-using ::testing::SetArgPointee;
-using ::testing::Return;
 
 // AsyncCertIssuerSourceStatic always returns its certs asynchronously.
 class AsyncCertIssuerSourceStatic : public CertIssuerSource {
  public:
   class StaticAsyncRequest : public Request {
    public:
     StaticAsyncRequest(const IssuerCallback& issuers_callback,
                        ParsedCertificateList&& issuers)
         : cancelable_closure_(base::Bind(&StaticAsyncRequest::RunCallback,
                                          base::Unretained(this))),
@@ skipping 108 matching lines @@
 
  protected:
   scoped_refptr<ParsedCertificate> a_by_b_, b_by_c_, b_by_f_, c_by_d_, c_by_e_,
       d_by_d_, e_by_e_, f_by_e_;
 
   SimpleSignaturePolicy signature_policy_;
   der::GeneralizedTime time_ = {2016, 4, 11, 0, 0, 0};
 };
 
 void AddTrustedCertificate(scoped_refptr<ParsedCertificate> cert,
-                           TrustStore* trust_store) {
+                           TrustStoreInMemory* trust_store) {
   ASSERT_TRUE(cert.get());
   scoped_refptr<TrustAnchor> anchor =
       TrustAnchor::CreateFromCertificateNoConstraints(std::move(cert));
   ASSERT_TRUE(anchor.get());
   trust_store->AddTrustAnchor(std::move(anchor));
 }
 
 // If the target cert is has the same name and key as a trust anchor, however
 // is signed but a different trust anchor. This should successfully build a
 // path, however the trust anchor will be the signer of this cert.
 //
 // (This test is very similar to TestEndEntityHasSameNameAndSpkiAsTrustAnchor
 // but with different data; also in this test the target cert itself is in the
 // trust store).
 TEST_F(PathBuilderMultiRootTest, TargetHasNameAndSpkiOfTrustAnchor) {
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(a_by_b_, &trust_store);
   AddTrustedCertificate(b_by_f_, &trust_store);
 
   CertPathBuilder::Result result;
   CertPathBuilder path_builder(a_by_b_, &trust_store, &signature_policy_, time_,
                                &result);
 
   EXPECT_EQ(CompletionStatus::SYNC, RunPathBuilder(&path_builder));
 
   EXPECT_EQ(OK, result.error());
   ASSERT_FALSE(result.paths.empty());
   const auto& path = result.paths[result.best_result_index]->path;
   ASSERT_EQ(1U, path.certs.size());
   EXPECT_EQ(a_by_b_, path.certs[0]);
   EXPECT_EQ(b_by_f_, path.trust_anchor->cert());
 }
 
 // If the target cert is has the same name and key as a trust anchor, however
 // is NOT itself signed by a trust anchor, it fails. Although the provided SPKI
 // is trusted, the certificate contents cannot be verified.
 TEST_F(PathBuilderMultiRootTest, TargetWithSameNameAsTrustAnchorFails) {
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(a_by_b_, &trust_store);
 
   CertPathBuilder::Result result;
   CertPathBuilder path_builder(a_by_b_, &trust_store, &signature_policy_, time_,
                                &result);
 
   EXPECT_EQ(CompletionStatus::SYNC, RunPathBuilder(&path_builder));
 
   EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, result.error());
 }
 
 // Test a failed path building when the trust anchor is provided as a
 // supplemental certificate. Conceptually the following paths can be built:
 //
 //   B(C) <- C(D) <- [Trust anchor D]
 //   B(C) <- C(D) <- D(D) <- [Trust anchor D]
 //
 // The second one is extraneous given the shorter one, however path building
 // will enumerate it if the shorter one failed validation.
 TEST_F(PathBuilderMultiRootTest, SelfSignedTrustAnchorSupplementalCert) {
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(d_by_d_, &trust_store);
 
   // The (extraneous) trust anchor D(D) is supplied as a certificate, as is the
   // intermediate needed for path building C(D).
   CertIssuerSourceStatic sync_certs;
   sync_certs.AddCert(d_by_d_);
   sync_certs.AddCert(c_by_d_);
 
   // C(D) is not valid at this time, so path building will fail.
   der::GeneralizedTime expired_time = {2016, 1, 1, 0, 0, 0};
@@ skipping 19 matching lines @@
   ASSERT_EQ(3U, path1.certs.size());
   EXPECT_EQ(b_by_c_, path1.certs[0]);
   EXPECT_EQ(c_by_d_, path1.certs[1]);
   EXPECT_EQ(d_by_d_, path1.certs[2]);
   EXPECT_EQ(d_by_d_, path1.trust_anchor->cert());
 }
 
 // If the target cert is a self-signed cert whose key is a trust anchor, it
 // should verify.
 TEST_F(PathBuilderMultiRootTest, TargetIsSelfSignedTrustAnchor) {
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(e_by_e_, &trust_store);
   // This is not necessary for the test, just an extra...
   AddTrustedCertificate(f_by_e_, &trust_store);
 
   CertPathBuilder::Result result;
   CertPathBuilder path_builder(e_by_e_, &trust_store, &signature_policy_, time_,
                                &result);
 
   EXPECT_EQ(CompletionStatus::SYNC, RunPathBuilder(&path_builder));
 
   EXPECT_EQ(OK, result.error());
   ASSERT_FALSE(result.paths.empty());
   const auto& path = result.paths[result.best_result_index]->path;
   ASSERT_EQ(1U, path.certs.size());
   EXPECT_EQ(e_by_e_, path.certs[0]);
   EXPECT_EQ(e_by_e_, path.trust_anchor->cert());
 }
 
 // If the target cert is directly issued by a trust anchor, it should verify
 // without any intermediate certs being provided.
 TEST_F(PathBuilderMultiRootTest, TargetDirectlySignedByTrustAnchor) {
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(b_by_f_, &trust_store);
 
   CertPathBuilder::Result result;
   CertPathBuilder path_builder(a_by_b_, &trust_store, &signature_policy_, time_,
                                &result);
 
   EXPECT_EQ(CompletionStatus::SYNC, RunPathBuilder(&path_builder));
 
   ASSERT_EQ(OK, result.error());
   ASSERT_FALSE(result.paths.empty());
   const auto& path = result.paths[result.best_result_index]->path;
   ASSERT_EQ(1U, path.certs.size());
   EXPECT_EQ(a_by_b_, path.certs[0]);
   EXPECT_EQ(b_by_f_, path.trust_anchor->cert());
 }
 
 // Test that async cert queries are not made if the path can be successfully
 // built with synchronously available certs.
 TEST_F(PathBuilderMultiRootTest, TriesSyncFirst) {
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(e_by_e_, &trust_store);
 
   CertIssuerSourceStatic sync_certs;
   sync_certs.AddCert(b_by_f_);
   sync_certs.AddCert(f_by_e_);
 
   AsyncCertIssuerSourceStatic async_certs;
   async_certs.AddCert(b_by_c_);
   async_certs.AddCert(c_by_e_);
 
   CertPathBuilder::Result result;
   CertPathBuilder path_builder(a_by_b_, &trust_store, &signature_policy_, time_,
                                &result);
   path_builder.AddCertIssuerSource(&async_certs);
   path_builder.AddCertIssuerSource(&sync_certs);
 
   EXPECT_EQ(CompletionStatus::SYNC, RunPathBuilder(&path_builder));
 
   EXPECT_EQ(OK, result.error());
   EXPECT_EQ(0, async_certs.num_async_gets());
 }
 
 // Test that async cert queries are not made if no callback is provided.
 TEST_F(PathBuilderMultiRootTest, SychronousOnlyMode) {
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(e_by_e_, &trust_store);
 
   CertIssuerSourceStatic sync_certs;
   sync_certs.AddCert(f_by_e_);
 
   AsyncCertIssuerSourceStatic async_certs;
   async_certs.AddCert(b_by_f_);
 
   CertPathBuilder::Result result;
   CertPathBuilder path_builder(a_by_b_, &trust_store, &signature_policy_, time_,
                                &result);
   path_builder.AddCertIssuerSource(&async_certs);
   path_builder.AddCertIssuerSource(&sync_certs);
 
   EXPECT_EQ(CompletionStatus::SYNC, path_builder.Run(base::Closure()));
 
   EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, result.error());
   EXPECT_EQ(0, async_certs.num_async_gets());
 }
 
 // If async queries are needed, all async sources will be queried
 // simultaneously.
 TEST_F(PathBuilderMultiRootTest, TestAsyncSimultaneous) {
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(e_by_e_, &trust_store);
 
   CertIssuerSourceStatic sync_certs;
   sync_certs.AddCert(b_by_c_);
   sync_certs.AddCert(b_by_f_);
 
   AsyncCertIssuerSourceStatic async_certs1;
   async_certs1.AddCert(c_by_e_);
 
   AsyncCertIssuerSourceStatic async_certs2;
@@ skipping 10 matching lines @@
 
   EXPECT_EQ(OK, result.error());
   EXPECT_EQ(1, async_certs1.num_async_gets());
   EXPECT_EQ(1, async_certs2.num_async_gets());
 }
 
 // Test that PathBuilder does not generate longer paths than necessary if one of
 // the supplied certs is itself a trust anchor.
 TEST_F(PathBuilderMultiRootTest, TestLongChain) {
   // Both D(D) and C(D) are trusted roots.
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(d_by_d_, &trust_store);
   AddTrustedCertificate(c_by_d_, &trust_store);
 
   // Certs B(C), and C(D) are all supplied.
   CertIssuerSourceStatic sync_certs;
   sync_certs.AddCert(b_by_c_);
   sync_certs.AddCert(c_by_d_);
 
   CertPathBuilder::Result result;
   CertPathBuilder path_builder(a_by_b_, &trust_store, &signature_policy_, time_,
                                &result);
   path_builder.AddCertIssuerSource(&sync_certs);
 
   EXPECT_EQ(CompletionStatus::SYNC, RunPathBuilder(&path_builder));
 
   EXPECT_EQ(OK, result.error());
 
   // The result path should be A(B) <- B(C) <- C(D)
   // not the longer but also valid A(B) <- B(C) <- C(D) <- D(D)
   ASSERT_FALSE(result.paths.empty());
   const auto& path = result.paths[result.best_result_index]->path;
   EXPECT_EQ(2U, path.certs.size());
 }
 
 // Test that PathBuilder will backtrack and try a different path if the first
 // one doesn't work out.
 TEST_F(PathBuilderMultiRootTest, TestBacktracking) {
   // Only D(D) is a trusted root.
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(d_by_d_, &trust_store);
 
   // Certs B(F) and F(E) are supplied synchronously, thus the path
   // A(B) <- B(F) <- F(E) should be built first, though it won't verify.
   CertIssuerSourceStatic sync_certs;
   sync_certs.AddCert(b_by_f_);
   sync_certs.AddCert(f_by_e_);
 
   // Certs B(C), and C(D) are supplied asynchronously, so the path
   // A(B) <- B(C) <- C(D) <- D(D) should be tried second.
@@ skipping 18 matching lines @@
   EXPECT_EQ(a_by_b_, path.certs[0]);
   EXPECT_EQ(b_by_c_, path.certs[1]);
   EXPECT_EQ(c_by_d_, path.certs[2]);
   EXPECT_EQ(d_by_d_, path.trust_anchor->cert());
 }
 
 // Test that whichever order CertIssuerSource returns the issuers, the path
 // building still succeeds.
 TEST_F(PathBuilderMultiRootTest, TestCertIssuerOrdering) {
   // Only D(D) is a trusted root.
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(d_by_d_, &trust_store);
 
   for (bool reverse_order : {false, true}) {
     SCOPED_TRACE(reverse_order);
     std::vector<scoped_refptr<ParsedCertificate>> certs = {
         b_by_c_, b_by_f_, f_by_e_, c_by_d_, c_by_e_};
     CertIssuerSourceStatic sync_certs;
     if (reverse_order) {
       for (auto it = certs.rbegin(); it != certs.rend(); ++it)
         sync_certs.AddCert(*it);
@@ skipping 67 matching lines @@
   scoped_refptr<ParsedCertificate> newrootrollover_;
 
   SimpleSignaturePolicy signature_policy_;
   der::GeneralizedTime time_;
 };
 
 // Tests that if only the old root cert is trusted, the path builder can build a
 // path through the new intermediate and rollover cert to the old root.
 TEST_F(PathBuilderKeyRolloverTest, TestRolloverOnlyOldRootTrusted) {
   // Only oldroot is trusted.
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   trust_store.AddTrustAnchor(oldroot_);
 
   // Old intermediate cert is not provided, so the pathbuilder will need to go
   // through the rollover cert.
   CertIssuerSourceStatic sync_certs;
   sync_certs.AddCert(newintermediate_);
   sync_certs.AddCert(newrootrollover_);
 
   CertPathBuilder::Result result;
   CertPathBuilder path_builder(target_, &trust_store, &signature_policy_, time_,
@@ skipping 26 matching lines @@
   EXPECT_EQ(newrootrollover_, path1.certs[2]);
   EXPECT_EQ(oldroot_, path1.trust_anchor);
 }
 
 // Tests that if both old and new roots are trusted it can build a path through
 // either.
 // TODO(mattm): Once prioritization is implemented, it should test that it
 // always builds the path through the new intermediate and new root.
 TEST_F(PathBuilderKeyRolloverTest, TestRolloverBothRootsTrusted) {
   // Both oldroot and newroot are trusted.
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   trust_store.AddTrustAnchor(oldroot_);
   AddTrustedCertificate(newroot_, &trust_store);
 
   // Both old and new intermediates + rollover cert are provided.
   CertIssuerSourceStatic sync_certs;
   sync_certs.AddCert(oldintermediate_);
   sync_certs.AddCert(newintermediate_);
   sync_certs.AddCert(newrootrollover_);
 
   CertPathBuilder::Result result;
@@ skipping 18 matching lines @@
     DVLOG(1) << "USED OLD";
     EXPECT_EQ(oldintermediate_, path.certs[1]);
     EXPECT_EQ(oldroot_, path.trust_anchor);
   } else {
     DVLOG(1) << "USED NEW";
     EXPECT_EQ(newintermediate_, path.certs[1]);
     EXPECT_EQ(newroot_, path.trust_anchor->cert());
   }
 }
 
+class MockTrustStore : public TrustStore {
+ public:
+  MOCK_CONST_METHOD2(FindTrustAnchorsByNormalizedName,
+                     void(const der::Input& normalized_name,
+                          TrustAnchors* matches));
+};
+
 // Tests that multiple trust root matches on a single path will be considered.
 // Both roots have the same subject but different keys. Only one of them will
 // verify.
 TEST_F(PathBuilderKeyRolloverTest, TestMultipleRootMatchesOnlyOneWorks) {
-  // Both newroot and oldroot are trusted.
-  TrustStore trust_store;
-  AddTrustedCertificate(newroot_, &trust_store);
-  trust_store.AddTrustAnchor(oldroot_);
+  NiceMock<MockTrustStore> trust_store;
+  // Default handler for any other TrustStore requests.
+  EXPECT_CALL(trust_store, FindTrustAnchorsByNormalizedName(_, _))
+      .WillRepeatedly(Return());
+  // Both newroot and oldroot are trusted, and newroot is returned first in the
+  // matches vector.
+  EXPECT_CALL(trust_store, FindTrustAnchorsByNormalizedName(
+                               newroot_->normalized_subject(), _))
+      .WillRepeatedly(Invoke(
+          [this](const der::Input& normalized_name, TrustAnchors* matches) {
+            matches->push_back(
+                TrustAnchor::CreateFromCertificateNoConstraints(newroot_));
+            matches->push_back(oldroot_);
+          }));
 
   // Only oldintermediate is supplied, so the path with newroot should fail,
   // oldroot should succeed.
   CertIssuerSourceStatic sync_certs;
   sync_certs.AddCert(oldintermediate_);
 
   CertPathBuilder::Result result;
   CertPathBuilder path_builder(target_, &trust_store, &signature_policy_, time_,
                                &result);
   path_builder.AddCertIssuerSource(&sync_certs);
 
   EXPECT_EQ(CompletionStatus::SYNC, RunPathBuilder(&path_builder));
 
   EXPECT_EQ(OK, result.error());
-  // There may be one or two paths attempted depending if the path builder tried
-  // using newroot first.
-  // TODO(mattm): Once TrustStore is an interface, this could be fixed with a
-  // mock version of TrustStore that returns roots in a deterministic order.
-  ASSERT_LE(1U, result.paths.size());
-  ASSERT_GE(2U, result.paths.size());
+  // Since FindTrustAnchorsByNormalizedName returns newroot first, it should be
+  // tried first. (Note: this may change if PathBuilder starts prioritizing the
+  // path building order.)
+  ASSERT_EQ(2U, result.paths.size());
 
-  if (result.paths.size() == 2) {
+  {
     // Path builder may first attempt: target <- oldintermediate <- newroot
     // but it will fail since oldintermediate is signed by oldroot.
     EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, result.paths[0]->error);
     const auto& path = result.paths[0]->path;
     ASSERT_EQ(2U, path.certs.size());
     EXPECT_EQ(target_, path.certs[0]);
     EXPECT_EQ(oldintermediate_, path.certs[1]);
     EXPECT_EQ(newroot_, path.trust_anchor->cert());
   }
 
-  // Path builder will next attempt:
-  // target <- old intermediate <- oldroot
-  // which should succeed.
-  EXPECT_EQ(OK, result.paths[result.best_result_index]->error);
-  const auto& path = result.paths[result.best_result_index]->path;
-  ASSERT_EQ(2U, path.certs.size());
-  EXPECT_EQ(target_, path.certs[0]);
-  EXPECT_EQ(oldintermediate_, path.certs[1]);
-  EXPECT_EQ(oldroot_, path.trust_anchor);
+  {
+    // Path builder will next attempt:
+    // target <- old intermediate <- oldroot
+    // which should succeed.
+    EXPECT_EQ(OK, result.paths[result.best_result_index]->error);
+    const auto& path = result.paths[result.best_result_index]->path;
+    ASSERT_EQ(2U, path.certs.size());
+    EXPECT_EQ(target_, path.certs[0]);
+    EXPECT_EQ(oldintermediate_, path.certs[1]);
+    EXPECT_EQ(oldroot_, path.trust_anchor);
+  }
 }
 
 // Tests that the path builder doesn't build longer than necessary paths.
 TEST_F(PathBuilderKeyRolloverTest, TestRolloverLongChain) {
   // Only oldroot is trusted.
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   trust_store.AddTrustAnchor(oldroot_);
 
   // New intermediate and new root are provided synchronously.
   CertIssuerSourceStatic sync_certs;
   sync_certs.AddCert(newintermediate_);
   sync_certs.AddCert(newroot_);
 
   // Rollover cert is only provided asynchronously. This will force the
   // pathbuilder to first try building a longer than necessary path.
   AsyncCertIssuerSourceStatic async_certs;
@@ skipping 45 matching lines @@
   EXPECT_EQ(newrootrollover_, path2.certs[2]);
   EXPECT_EQ(oldroot_, path2.trust_anchor);
 }
 
 // If the target cert is a trust anchor, however is not itself *signed* by a
 // trust anchor, then it is not considered valid (the SPKI and name of the
 // trust anchor matches the SPKI and subject of the targe certificate, but the
 // rest of the certificate cannot be verified).
 TEST_F(PathBuilderKeyRolloverTest, TestEndEntityIsTrustRoot) {
   // Trust newintermediate.
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(newintermediate_, &trust_store);
 
   CertPathBuilder::Result result;
   // Newintermediate is also the target cert.
   CertPathBuilder path_builder(newintermediate_, &trust_store,
                                &signature_policy_, time_, &result);
 
   EXPECT_EQ(CompletionStatus::SYNC, RunPathBuilder(&path_builder));
 
   EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, result.error());
 }
 
 // If target has same Name+SAN+SPKI as a necessary intermediate, test if a path
 // can still be built.
 // Since LoopChecker will prevent the intermediate from being included, this
 // currently does NOT verify. This case shouldn't occur in the web PKI.
 TEST_F(PathBuilderKeyRolloverTest,
        TestEndEntityHasSameNameAndSpkiAsIntermediate) {
   // Trust oldroot.
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   trust_store.AddTrustAnchor(oldroot_);
 
   // New root rollover is provided synchronously.
   CertIssuerSourceStatic sync_certs;
   sync_certs.AddCert(newrootrollover_);
 
   CertPathBuilder::Result result;
   // Newroot is the target cert.
   CertPathBuilder path_builder(newroot_, &trust_store, &signature_policy_,
                                time_, &result);
   path_builder.AddCertIssuerSource(&sync_certs);
 
   EXPECT_EQ(CompletionStatus::SYNC, RunPathBuilder(&path_builder));
 
   // This could actually be OK, but CertPathBuilder does not build the
   // newroot <- newrootrollover <- oldroot path.
   EXPECT_EQ(ERR_CERT_AUTHORITY_INVALID, result.error());
 }
 
 // If target has same Name+SAN+SPKI as the trust root, test that a (trivial)
 // path can still be built.
 TEST_F(PathBuilderKeyRolloverTest,
        TestEndEntityHasSameNameAndSpkiAsTrustAnchor) {
   // Trust newrootrollover.
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(newrootrollover_, &trust_store);
 
   CertPathBuilder::Result result;
   // Newroot is the target cert.
   CertPathBuilder path_builder(newroot_, &trust_store, &signature_policy_,
                                time_, &result);
 
   EXPECT_EQ(CompletionStatus::SYNC, RunPathBuilder(&path_builder));
 
   EXPECT_EQ(OK, result.error());
@@ skipping 12 matching lines @@
 
 // Test that PathBuilder will not try the same path twice if multiple
 // CertIssuerSources provide the same certificate.
 TEST_F(PathBuilderKeyRolloverTest, TestDuplicateIntermediates) {
   // Create a separate copy of oldintermediate.
   scoped_refptr<ParsedCertificate> oldintermediate_dupe(
       ParsedCertificate::CreateFromCertificateCopy(
           oldintermediate_->der_cert().AsStringPiece(), {}));
 
   // Only newroot is a trusted root.
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(newroot_, &trust_store);
 
   // The oldintermediate is supplied synchronously by |sync_certs1| and
   // another copy of oldintermediate is supplied synchronously by |sync_certs2|.
   // The path target <- oldintermediate <- newroot  should be built first,
   // though it won't verify. It should not be attempted again even though
   // oldintermediate was supplied twice.
   CertIssuerSourceStatic sync_certs1;
   sync_certs1.AddCert(oldintermediate_);
   CertIssuerSourceStatic sync_certs2;
@@ skipping 41 matching lines @@
 
 // Test when PathBuilder is given a cert CertIssuerSources that has the same
 // SPKI as a TrustAnchor.
 TEST_F(PathBuilderKeyRolloverTest, TestDuplicateIntermediateAndRoot) {
   // Create a separate copy of newroot.
   scoped_refptr<ParsedCertificate> newroot_dupe(
       ParsedCertificate::CreateFromCertificateCopy(
           newroot_->der_cert().AsStringPiece(), {}));
 
   // Only newroot is a trusted root.
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(newroot_, &trust_store);
 
   // The oldintermediate and newroot are supplied synchronously by |sync_certs|.
   CertIssuerSourceStatic sync_certs;
   sync_certs.AddCert(oldintermediate_);
   sync_certs.AddCert(newroot_dupe);
 
   CertPathBuilder::Result result;
   CertPathBuilder path_builder(target_, &trust_store, &signature_policy_, time_,
                                &result);
@@ skipping 49 matching lines @@
   std::unique_ptr<CertIssuerSource::Request> request_;
 };
 
 // Test that a single CertIssuerSource returning multiple async batches of
 // issuers is handled correctly. Due to the StrictMocks, it also tests that path
 // builder does not request issuers of certs that it shouldn't.
 TEST_F(PathBuilderKeyRolloverTest, TestMultipleAsyncCallbacksFromSingleSource) {
   StrictMock<MockCertIssuerSource> cert_issuer_source;
 
   // Only newroot is a trusted root.
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(newroot_, &trust_store);
 
   CertPathBuilder::Result result;
   CertPathBuilder path_builder(target_, &trust_store, &signature_policy_, time_,
                                &result);
   path_builder.AddCertIssuerSource(&cert_issuer_source);
 
   CertIssuerSource::IssuerCallback target_issuers_callback;
   // Create the mock CertIssuerSource::Request...
   std::unique_ptr<StrictMock<MockCertIssuerSourceRequest>>
@@ skipping 79 matching lines @@
   EXPECT_EQ(newintermediate_, path1.certs[1]);
   EXPECT_EQ(newroot_, path1.trust_anchor->cert());
 }
 
 // Test that PathBuilder will not try the same path twice if CertIssuerSources
 // asynchronously provide the same certificate multiple times.
 TEST_F(PathBuilderKeyRolloverTest, TestDuplicateAsyncIntermediates) {
   StrictMock<MockCertIssuerSource> cert_issuer_source;
 
   // Only newroot is a trusted root.
-  TrustStore trust_store;
+  TrustStoreInMemory trust_store;
   AddTrustedCertificate(newroot_, &trust_store);
 
   CertPathBuilder::Result result;
   CertPathBuilder path_builder(target_, &trust_store, &signature_policy_, time_,
                                &result);
   path_builder.AddCertIssuerSource(&cert_issuer_source);
 
   CertIssuerSource::IssuerCallback target_issuers_callback;
   // Create the mock CertIssuerSource::Request...
   std::unique_ptr<StrictMock<MockCertIssuerSourceRequest>>
@@ skipping 93 matching lines @@
   const auto& path1 = result.paths[1]->path;
   ASSERT_EQ(2U, path1.certs.size());
   EXPECT_EQ(target_, path1.certs[0]);
   EXPECT_EQ(newintermediate_, path1.certs[1]);
   EXPECT_EQ(newroot_, path1.trust_anchor->cert());
 }
 
 }  // namespace
 
 }  // namespace net