Update CertVerifier::Verify to use RequestParams instead

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 40 matching lines @@
   // 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(X509Certificate* cert,
-             const std::string& hostname,
-             const std::string& ocsp_response,
-             int flags,
+  int Verify(const RequestParams& params,
              CRLSet* crl_set,
              CertVerifyResult* verify_result,
              const CompletionCallback& callback,
              std::unique_ptr<Request>* out_req,
              const BoundNetLog& net_log) override;
 
   bool SupportsOCSPStapling() override;
 
  private:
   struct JobToRequestParamsComparator;
@@ skipping 40 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,
+  using CertVerifierCache = ExpiringCache<RequestParams,
                                           CachedResult,
                                           CacheValidityPeriod,
                                           CacheExpirationFunctor>;
 
   // Saves |result| into the cache, keyed by |key|, which began validation at
   // |start_time|.
-  void SaveResultToCache(const CertVerifier::RequestParams& key,
+  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.
-  CertVerifierJob* FindJob(const CertVerifier::RequestParams& key);
+  CertVerifierJob* FindJob(const 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_