Move caching out of MultiThreadedCertVerifier

net/cert/cert_verifier.cc

 // 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.
 
 #include "net/cert/cert_verifier.h"
 
 #include <openssl/sha.h>
 
 #include <algorithm>
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "net/cert/cert_verify_proc.h"
 
 #if defined(OS_NACL)
 #include "base/logging.h"
 #else
+#include "net/cert/caching_cert_verifier.h"
 #include "net/cert/multi_threaded_cert_verifier.h"
 #endif
 
 namespace net {
 
 CertVerifier::RequestParams::RequestParams(
     scoped_refptr<X509Certificate> certificate,
     const std::string& hostname,
     int flags,
     const std::string& ocsp_response,
@@ skipping 39 matching lines @@
 
 bool CertVerifier::SupportsOCSPStapling() {
   return false;
 }
 
 std::unique_ptr<CertVerifier> CertVerifier::CreateDefault() {
 #if defined(OS_NACL)
   NOTIMPLEMENTED();
   return std::unique_ptr<CertVerifier>();
 #else
-  return base::WrapUnique(
-      new MultiThreadedCertVerifier(CertVerifyProc::CreateDefault()));
+  return base::MakeUnique<CachingCertVerifier>(
+      base::MakeUnique<MultiThreadedCertVerifier>(
+          CertVerifyProc::CreateDefault()));
 #endif
 }
 
 }  // namespace net