Remove the fingerprint and ca_fingerprint from X509Certificate

content/browser/cert_store_impl.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 "content/browser/cert_store_impl.h"
 
 namespace content {
 
 // static
 CertStore* CertStore::GetInstance() {
   return CertStoreImpl::GetInstance();
 }
 
 //  static
 CertStoreImpl* CertStoreImpl::GetInstance() {
   return base::Singleton<CertStoreImpl>::get();
 }
 
 CertStoreImpl::CertStoreImpl() {}
 
 CertStoreImpl::~CertStoreImpl() {}
 
+CertStoreImpl::HashAndCert::HashAndCert() = default;
+
+bool CertStoreImpl::HashAndCert::LessThan::operator()(
+    const scoped_refptr<HashAndCert>& lhs,
+    const scoped_refptr<HashAndCert>& rhs) const {
+  return net::SHA256HashValueLessThan()(lhs->chain_hash, rhs->chain_hash);
+}
+
+CertStoreImpl::HashAndCert::~HashAndCert() = default;
+
 int CertStoreImpl::StoreCert(net::X509Certificate* cert, int process_id) {
-  return store_.Store(cert, process_id);
+  scoped_refptr<HashAndCert> hash_and_cert(new HashAndCert);
+  hash_and_cert->chain_hash =

[eroman, 2016/06/09 22:18:25]

I would say make HashAndCert's ctor take |cert| and do this initialization
there.

[Ryan Sleevi, 2016/06/09 22:59:36]

That doesn't meaningfully work, because std::map requires that ValueType be
default-initializable, so I'd have

HashAndCert {
 public:
  HashAndCert();
  explicit HashAndCert(net::X509Certificate* cert);
}

and since it's all within this file and right here, seemed unnecessary.

+      net::X509Certificate::CalculateChainFingerprint256(
+          cert->os_cert_handle(), cert->GetIntermediateCertificates());
+  hash_and_cert->cert = cert;
+  return store_.Store(hash_and_cert.get(), process_id);
 }
 
 bool CertStoreImpl::RetrieveCert(int cert_id,
                                  scoped_refptr<net::X509Certificate>* cert) {
-  return store_.Retrieve(cert_id, cert);
+  scoped_refptr<HashAndCert> hash_and_cert;
+  if (store_.Retrieve(cert_id, &hash_and_cert)) {
+    *cert = hash_and_cert->cert;
+    return true;
+  }
+  return false;
 }
 
 }  // namespace content