Introduce CertVerifier::RequestParams

net/cert/multi_threaded_cert_verifier.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_CERT_MULTI_THREADED_CERT_VERIFIER_H_
 #define NET_CERT_MULTI_THREADED_CERT_VERIFIER_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 67 matching lines @@
   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);
   FRIEND_TEST_ALL_PREFIXES(MultiThreadedCertVerifierTest,
                            RequestParamsComparators);
   FRIEND_TEST_ALL_PREFIXES(MultiThreadedCertVerifierTest,
                            CertTrustAnchorProvider);
 
-  // Input parameters of a certificate verification request.
-  struct NET_EXPORT_PRIVATE RequestParams {
-    RequestParams(const SHA1HashValue& cert_fingerprint_arg,
-                  const SHA1HashValue& ca_fingerprint_arg,
-                  const std::string& hostname_arg,
-                  const std::string& ocsp_response_arg,
-                  int flags_arg,
-                  const CertificateList& additional_trust_anchors);
-    RequestParams(const RequestParams& other);
-    ~RequestParams();
-
-    bool operator<(const RequestParams& other) const;
-
-    std::string hostname;
-    int flags;
-    std::vector<SHA1HashValue> hash_values;
-    // The time when verification started.
-    // Note: This uses base::Time, rather than base::TimeTicks, to
-    // account for system clock changes.
-    base::Time start_time;
-  };
-
   // 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
@@ skipping 17 matching lines @@
     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<CertVerifier::RequestParams,
+                                          CachedResult,
+                                          CacheValidityPeriod,
+                                          CacheExpirationFunctor>;
 
-  typedef ExpiringCache<RequestParams, CachedResult, CacheValidityPeriod,
-                        CacheExpirationFunctor> CertVerifierCache;
-
-  // Saves |result| into the cache, keyed by |key|.
-  void SaveResultToCache(const RequestParams& key, const CachedResult& result);
+  // Saves |result| into the cache, keyed by |key|, which began validation at
+  // |start_time|.
+  void SaveResultToCache(const CertVerifier::RequestParams& key,

[eroman, 2016/05/18 01:43:18]

nit: is the CertVerifier:: prefix needed here?

+                         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.
-  CertVerifierJob* FindJob(const RequestParams& key);
+  CertVerifierJob* FindJob(const CertVerifier::RequestParams& key);
 
   // Removes |job| from the inflight set, and passes ownership back to the
   // caller. |job| must already be |inflight_|.
   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_; }
@@ skipping 12 matching lines @@
   scoped_refptr<CertVerifyProc> verify_proc_;
 
   CertTrustAnchorProvider* trust_anchor_provider_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiThreadedCertVerifier);
 };
 
 }  // namespace net
 
 #endif  // NET_CERT_MULTI_THREADED_CERT_VERIFIER_H_