Remove the fingerprint and ca_fingerprint from X509Certificate

content/browser/cert_store_impl.h

Index: content/browser/cert_store_impl.h
diff --git a/content/browser/cert_store_impl.h b/content/browser/cert_store_impl.h
index 2b08c52c802cb03ddf718ec714cb46ee54a2b33f..b4ef08c00446c45a668c6b9ffba374c66288683e 100644
--- a/content/browser/cert_store_impl.h
+++ b/content/browser/cert_store_impl.h
@@ -6,9 +6,11 @@
 #define CONTENT_BROWSER_CERT_STORE_IMPL_H_
 
 #include "base/macros.h"
+#include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "content/browser/renderer_data_memoizing_store.h"
 #include "content/public/browser/cert_store.h"
+#include "net/base/hash_value.h"
 #include "net/cert/x509_certificate.h"
 
 namespace content {
@@ -31,7 +33,30 @@ class CertStoreImpl : public CertStore {
  private:
   friend struct base::DefaultSingletonTraits<CertStoreImpl>;
 
-  RendererDataMemoizingStore<net::X509Certificate> store_;
+  // Utility structure that allows memoization to be based on the
+  // hash of |cert|'s certificate chain, to avoid needing to compare
+  // every certificate individually. This is purely an optimization.
+  class HashAndCert : public base::RefCountedThreadSafe<HashAndCert> {
+   public:
+    HashAndCert();
+
+    // Comparator for RendererDataMemoizingStore.
+    struct LessThan {
+      bool operator()(const scoped_refptr<HashAndCert>& lhs,
+                      const scoped_refptr<HashAndCert>& rhs) const;
+    };
+
+    net::SHA256HashValue chain_hash;
+    scoped_refptr<net::X509Certificate> cert;
+
+   private:
+    friend class base::RefCountedThreadSafe<HashAndCert>;
+
+    ~HashAndCert();
+
+    DISALLOW_COPY_AND_ASSIGN(HashAndCert);
+  };
+  RendererDataMemoizingStore<HashAndCert> store_;
 
   DISALLOW_COPY_AND_ASSIGN(CertStoreImpl);
 };