Remove CertTrustAnchorProvider from net

net/cert/caching_cert_verifier_unittest.cc

Index: net/cert/caching_cert_verifier_unittest.cc
diff --git a/net/cert/caching_cert_verifier_unittest.cc b/net/cert/caching_cert_verifier_unittest.cc
index e8fd88329d7c0839ba3cda793d8c06f92593b111..75d920c5f60135c12ac28c7d9d5b5c4599fb07b3 100644
--- a/net/cert/caching_cert_verifier_unittest.cc
+++ b/net/cert/caching_cert_verifier_unittest.cc
@@ -12,7 +12,6 @@
 #include "net/base/net_errors.h"
 #include "net/base/test_completion_callback.h"
 #include "net/base/test_data_directory.h"
-#include "net/cert/cert_trust_anchor_provider.h"
 #include "net/cert/cert_verifier.h"
 #include "net/cert/cert_verify_result.h"
 #include "net/cert/mock_cert_verifier.h"
@@ -27,18 +26,6 @@ using testing::ReturnRef;
 
 namespace net {
 
-namespace {
-
-class MockCertTrustAnchorProvider : public CertTrustAnchorProvider {
- public:
-  MockCertTrustAnchorProvider() {}
-  virtual ~MockCertTrustAnchorProvider() {}
-
-  MOCK_METHOD0(GetAdditionalTrustAnchors, const CertificateList&());
-};
-
-}  // namespace
-
 class CachingCertVerifierTest : public ::testing::Test {
  public:
   CachingCertVerifierTest() : verifier_(base::MakeUnique<MockCertVerifier>()) {}
@@ -137,59 +124,4 @@ TEST_F(CachingCertVerifierTest, DifferentCACerts) {
   ASSERT_EQ(2u, verifier_.GetCacheSize());
 }
 
-TEST_F(CachingCertVerifierTest, CertTrustAnchorProvider) {
-  MockCertTrustAnchorProvider trust_provider;
-  verifier_.SetCertTrustAnchorProvider(&trust_provider);
-
-  scoped_refptr<X509Certificate> test_cert(
-      ImportCertFromFile(GetTestCertsDirectory(), "ok_cert.pem"));
-  ASSERT_TRUE(test_cert.get());
-
-  const CertificateList empty_cert_list;
-  CertificateList cert_list;
-  cert_list.push_back(test_cert);
-
-  // Check that Verify() asks the |trust_provider| for the current list of
-  // additional trust anchors.
-  int error;
-  CertVerifyResult verify_result;
-  TestCompletionCallback callback;
-  std::unique_ptr<CertVerifier::Request> request;
-  EXPECT_CALL(trust_provider, GetAdditionalTrustAnchors())
-      .WillOnce(ReturnRef(empty_cert_list));
-  error = callback.GetResult(verifier_.Verify(
-      CertVerifier::RequestParams(test_cert, "www.example.com", 0,
-                                  std::string(), CertificateList()),
-      nullptr, &verify_result, callback.callback(), &request, BoundNetLog()));
-  Mock::VerifyAndClearExpectations(&trust_provider);
-  EXPECT_TRUE(IsCertificateError(error));
-  ASSERT_EQ(1u, verifier_.requests());
-  ASSERT_EQ(0u, verifier_.cache_hits());
-
-  // The next Verify() uses the cached result.
-  EXPECT_CALL(trust_provider, GetAdditionalTrustAnchors())
-      .WillOnce(ReturnRef(empty_cert_list));
-  error = callback.GetResult(verifier_.Verify(
-      CertVerifier::RequestParams(test_cert, "www.example.com", 0,
-                                  std::string(), CertificateList()),
-      nullptr, &verify_result, callback.callback(), &request, BoundNetLog()));
-  Mock::VerifyAndClearExpectations(&trust_provider);
-  EXPECT_TRUE(IsCertificateError(error));
-  ASSERT_EQ(2u, verifier_.requests());
-  ASSERT_EQ(1u, verifier_.cache_hits());
-
-  // Another Verify() for the same certificate but with a different list of
-  // trust anchors will not reuse the cache.
-  EXPECT_CALL(trust_provider, GetAdditionalTrustAnchors())
-      .WillOnce(ReturnRef(cert_list));
-  error = callback.GetResult(verifier_.Verify(
-      CertVerifier::RequestParams(test_cert, "www.example.com", 0,
-                                  std::string(), CertificateList()),
-      nullptr, &verify_result, callback.callback(), &request, BoundNetLog()));
-  Mock::VerifyAndClearExpectations(&trust_provider);
-  EXPECT_TRUE(IsCertificateError(error));
-  ASSERT_EQ(3u, verifier_.requests());
-  ASSERT_EQ(1u, verifier_.cache_hits());
-}
-
 }  // namespace net