Refactor X509Certificate caching to cache the OS handle, rather than the X509Certificate

net/base/cert_database_nss_unittest.cc

 // Copyright (c) 2010 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 <cert.h>
 #include <pk11pub.h>
 
 #include <algorithm>
 
 #include "base/crypto/scoped_nss_types.h"
@@ skipping 32 matching lines @@
   certs_dir = certs_dir.AppendASCII("certificates");
   return certs_dir;
 }
 
 CertificateList ListCertsInSlot(PK11SlotInfo* slot) {
   CertificateList result;
   CERTCertList* cert_list = PK11_ListCertsInSlot(slot);
   for (CERTCertListNode* node = CERT_LIST_HEAD(cert_list);
        !CERT_LIST_END(node, cert_list);
        node = CERT_LIST_NEXT(node)) {
-    result.push_back(
-        X509Certificate::CreateFromHandle(
-            node->cert,
-            X509Certificate::SOURCE_LONE_CERT_IMPORT,
-            X509Certificate::OSCertHandles()));
+    result.push_back(X509Certificate::CreateFromHandle(
+        node->cert, X509Certificate::OSCertHandles()));
   }
   CERT_DestroyCertList(cert_list);
 
   // Sort the result so that test comparisons can be deterministic.
   std::sort(result.begin(), result.end(), X509Certificate::LessThan());
   return result;
 }
 
 bool CleanupSlotContents(PK11SlotInfo* slot) {
   CertDatabase cert_db;
@@ skipping 414 matching lines @@
       puny_cert.get(), CA_CERT,
       CertDatabase::TRUSTED_SSL | CertDatabase::TRUSTED_EMAIL));
 
   verify_result.Reset();
   error = puny_cert->Verify("xn--wgv71a119e.com", flags, &verify_result);
   EXPECT_EQ(OK, error);
   EXPECT_EQ(0, verify_result.cert_status);
 }
 
 }  // namespace net