Move caching out of MultiThreadedCertVerifier

net/cert/cert_verifier.cc

Index: net/cert/cert_verifier.cc
diff --git a/net/cert/cert_verifier.cc b/net/cert/cert_verifier.cc
index 3077588f45ac31d87bcfd39758a0a96077ba76ba..f6aa2df898e65e0adb3db3af623468187f9f13ed 100644
--- a/net/cert/cert_verifier.cc
+++ b/net/cert/cert_verifier.cc
@@ -17,6 +17,7 @@
 #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
 
@@ -76,8 +77,9 @@ std::unique_ptr<CertVerifier> CertVerifier::CreateDefault() {
   NOTIMPLEMENTED();
   return std::unique_ptr<CertVerifier>();
 #else
-  return base::WrapUnique(
-      new MultiThreadedCertVerifier(CertVerifyProc::CreateDefault()));
+  return base::MakeUnique<CachingCertVerifier>(
+      base::MakeUnique<MultiThreadedCertVerifier>(
+          CertVerifyProc::CreateDefault()));
 #endif
 }