Move caching out of MultiThreadedCertVerifier

net/cert/multi_threaded_cert_verifier.h

Index: net/cert/multi_threaded_cert_verifier.h
diff --git a/net/cert/multi_threaded_cert_verifier.h b/net/cert/multi_threaded_cert_verifier.h
index 6c3250b1386858cecd7600ead7c6209278045808..b2398951da1b3aebe4cf45a67aeab414b601cb05 100644
--- a/net/cert/multi_threaded_cert_verifier.h
+++ b/net/cert/multi_threaded_cert_verifier.h
@@ -18,17 +18,11 @@
 #include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
 #include "net/base/completion_callback.h"
-#include "net/base/expiring_cache.h"
-#include "net/base/hash_value.h"
 #include "net/base/net_export.h"
-#include "net/cert/cert_database.h"
 #include "net/cert/cert_verifier.h"
-#include "net/cert/cert_verify_result.h"
-#include "net/cert/x509_cert_types.h"
 
 namespace net {
 
-class CertTrustAnchorProvider;
 class CertVerifierJob;
 class CertVerifierRequest;
 class CertVerifierWorker;
@@ -38,8 +32,7 @@ class CertVerifyProc;
 // synchronous CertVerifier implementations on worker threads.
 class NET_EXPORT_PRIVATE MultiThreadedCertVerifier
     : public CertVerifier,
-      NON_EXPORTED_BASE(public base::NonThreadSafe),
-      public CertDatabase::Observer {
+      NON_EXPORTED_BASE(public base::NonThreadSafe) {
  public:
   explicit MultiThreadedCertVerifier(CertVerifyProc* verify_proc);
 
@@ -47,16 +40,6 @@ class NET_EXPORT_PRIVATE MultiThreadedCertVerifier
   // canceled, and their completion callbacks will not be called.
   ~MultiThreadedCertVerifier() override;
 
-  // Configures a source of additional certificates that should be treated as
-  // trust anchors during verification, provided that the underlying
-  // CertVerifyProc supports additional trust beyond the default implementation.
-  // The CertTrustAnchorProvider will only be accessed on the same
-  // thread that Verify() is called on; that is, it will not be
-  // accessed from worker threads.
-  // It must outlive the MultiThreadedCertVerifier.
-  void SetCertTrustAnchorProvider(
-      CertTrustAnchorProvider* trust_anchor_provider);
-
   // CertVerifier implementation
   int Verify(const RequestParams& params,
              CRLSet* crl_set,
@@ -72,8 +55,6 @@ class NET_EXPORT_PRIVATE MultiThreadedCertVerifier
   friend class CertVerifierRequest;
   friend class CertVerifierJob;
   friend class MultiThreadedCertVerifierTest;
-  FRIEND_TEST_ALL_PREFIXES(MultiThreadedCertVerifierTest, CacheHit);
-  FRIEND_TEST_ALL_PREFIXES(MultiThreadedCertVerifierTest, DifferentCACerts);
   FRIEND_TEST_ALL_PREFIXES(MultiThreadedCertVerifierTest, InflightJoin);
   FRIEND_TEST_ALL_PREFIXES(MultiThreadedCertVerifierTest, MultipleInflightJoin);
   FRIEND_TEST_ALL_PREFIXES(MultiThreadedCertVerifierTest, CancelRequest);
@@ -82,56 +63,12 @@ class NET_EXPORT_PRIVATE MultiThreadedCertVerifier
   FRIEND_TEST_ALL_PREFIXES(MultiThreadedCertVerifierTest,
                            CertTrustAnchorProvider);
 
-  // CachedResult contains the result of a certificate verification.
-  struct NET_EXPORT_PRIVATE CachedResult {
-    CachedResult();
-    ~CachedResult();
-
-    int error;  // The return value of CertVerifier::Verify.
-    CertVerifyResult result;  // The output of CertVerifier::Verify.
-  };
-
-  // Rather than having a single validity point along a monotonically increasing
-  // timeline, certificate verification is based on falling within a range of
-  // the certificate's NotBefore and NotAfter and based on what the current
-  // system clock says (which may advance forwards or backwards as users correct
-  // clock skew). CacheValidityPeriod and CacheExpirationFunctor are helpers to
-  // ensure that expiration is measured both by the 'general' case (now + cache
-  // TTL) and by whether or not significant enough clock skew was introduced
-  // since the last verification.
-  struct CacheValidityPeriod {
-    explicit CacheValidityPeriod(const base::Time& now);
-    CacheValidityPeriod(const base::Time& now, const base::Time& expiration);
-
-    base::Time verification_time;
-    base::Time expiration_time;
-  };
-
-  struct CacheExpirationFunctor {
-    // Returns true iff |now| is within the validity period of |expiration|.
-    bool operator()(const CacheValidityPeriod& now,
-                    const CacheValidityPeriod& expiration) const;
-  };
-
   struct JobComparator {
     bool operator()(const CertVerifierJob* job1,
                     const CertVerifierJob* job2) const;
   };
 
   using JobSet = std::set<CertVerifierJob*, JobComparator>;
-  using CertVerifierCache = ExpiringCache<RequestParams,
-                                          CachedResult,
-                                          CacheValidityPeriod,
-                                          CacheExpirationFunctor>;
-
-  // Saves |result| into the cache, keyed by |key|, which began validation at
-  // |start_time|.
-  void SaveResultToCache(const RequestParams& key,
-                         const base::Time& start_time,
-                         const CachedResult& result);
-
-  // CertDatabase::Observer methods:
-  void OnCACertChanged(const X509Certificate* cert) override;
 
   // Returns an inflight job for |key|. If there is no such job then returns
   // null.
@@ -142,26 +79,17 @@ class NET_EXPORT_PRIVATE MultiThreadedCertVerifier
   std::unique_ptr<CertVerifierJob> RemoveJob(CertVerifierJob* job);
 
   // For unit testing.
-  void ClearCache() { cache_.Clear(); }
-  size_t GetCacheSize() const { return cache_.size(); }
-  uint64_t cache_hits() const { return cache_hits_; }
   uint64_t requests() const { return requests_; }
   uint64_t inflight_joins() const { return inflight_joins_; }
 
-  // cache_ maps from a request to a cached result.
-  CertVerifierCache cache_;
-
   // inflight_ holds the jobs for which an active verification is taking place.
   JobSet inflight_;
 
   uint64_t requests_;
-  uint64_t cache_hits_;
   uint64_t inflight_joins_;
 
   scoped_refptr<CertVerifyProc> verify_proc_;
 
-  CertTrustAnchorProvider* trust_anchor_provider_;
-
   DISALLOW_COPY_AND_ASSIGN(MultiThreadedCertVerifier);
 };