Move caching out of MultiThreadedCertVerifier

chrome/browser/chromeos/policy/policy_cert_verifier.cc

 // Copyright (c) 2013 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 "chrome/browser/chromeos/policy/policy_cert_verifier.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_errors.h"
+#include "net/cert/caching_cert_verifier.h"
 #include "net/cert/cert_verify_proc.h"
 #include "net/cert/multi_threaded_cert_verifier.h"
 
 namespace policy {
 
 namespace {
 
 void MaybeSignalAnchorUse(int error,
                           const base::Closure& anchor_used_callback,
                           const net::CertVerifyResult& verify_result) {
@@ skipping 28 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
 }
 
 void PolicyCertVerifier::InitializeOnIOThread(
     const scoped_refptr<net::CertVerifyProc>& verify_proc) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   if (!verify_proc->SupportsAdditionalTrustAnchors()) {
     LOG(WARNING)
         << "Additional trust anchors not supported on the current platform!";
   }
-  net::MultiThreadedCertVerifier* verifier =
-      new net::MultiThreadedCertVerifier(verify_proc.get());
+  std::unique_ptr<net::CachingCertVerifier> verifier =
+      base::MakeUnique<net::CachingCertVerifier>(
+          base::MakeUnique<MultiThreadedCertVerifier>(verify_proc.get()));
   verifier->SetCertTrustAnchorProvider(this);
-  delegate_.reset(verifier);
+  delegate_ = std::move(verifier);
 }
 
 void PolicyCertVerifier::SetTrustAnchors(
     const net::CertificateList& trust_anchors) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   trust_anchors_ = trust_anchors;
 }
 
 int PolicyCertVerifier::Verify(
     const RequestParams& params,
@@ skipping 19 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   return delegate_->SupportsOCSPStapling();
 }
 
 const net::CertificateList& PolicyCertVerifier::GetAdditionalTrustAnchors() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   return trust_anchors_;
 }
 
 }  // namespace policy