Index: content/browser/cert_store_impl.h |
diff --git a/content/browser/cert_store_impl.h b/content/browser/cert_store_impl.h |
index 8a326e95e8f9c3e0e419587f1349b645e395ee91..03e3fe864b5ff1184622059135ce04ed32008985 100644 |
--- a/content/browser/cert_store_impl.h |
+++ b/content/browser/cert_store_impl.h |
@@ -9,6 +9,7 @@ |
#include "base/memory/singleton.h" |
#include "base/synchronization/lock.h" |
+#include "content/browser/renderer_data_memoizing_store.h" |
#include "content/public/browser/cert_store.h" |
#include "content/public/browser/notification_observer.h" |
#include "content/public/browser/notification_registrar.h" |
@@ -16,8 +17,7 @@ |
namespace content { |
-class CertStoreImpl : public CertStore, |
- public NotificationObserver { |
+class CertStoreImpl : public CertStore { |
public: |
// Returns the singleton instance of the CertStore. |
static CertStoreImpl* GetInstance(); |
@@ -28,46 +28,13 @@ class CertStoreImpl : public CertStore, |
virtual bool RetrieveCert(int cert_id, |
scoped_refptr<net::X509Certificate>* cert) OVERRIDE; |
- // NotificationObserver implementation. |
- virtual void Observe(int type, |
- const NotificationSource& source, |
- const NotificationDetails& details) OVERRIDE; |
protected: |
CertStoreImpl(); |
virtual ~CertStoreImpl(); |
private: |
+ RendererDataMemoizingStore<net::X509Certificate> store_; |
friend struct DefaultSingletonTraits<CertStoreImpl>; |
- |
- void RegisterForNotification(); |
- |
- // Remove the specified cert from id_to_cert_ and cert_to_id_. |
- // NOTE: the caller (RemoveCertsForRenderProcesHost) must hold cert_lock_. |
- void RemoveCertInternal(int cert_id); |
- |
- // Removes all the certs associated with the specified process from the store. |
- void RemoveCertsForRenderProcesHost(int render_process_host_id); |
- |
- typedef std::multimap<int, int> IDMap; |
- typedef std::map<int, scoped_refptr<net::X509Certificate> > CertMap; |
- typedef std::map<net::X509Certificate*, int, net::X509Certificate::LessThan> |
- ReverseCertMap; |
- |
- // Is only used on the UI Thread. |
- NotificationRegistrar registrar_; |
- |
- IDMap process_id_to_cert_id_; |
- IDMap cert_id_to_process_id_; |
- |
- CertMap id_to_cert_; |
- ReverseCertMap cert_to_id_; |
- |
- int next_cert_id_; |
- |
- // This lock protects: process_to_ids_, id_to_processes_, id_to_cert_ and |
- // cert_to_id_. |
- base::Lock cert_lock_; |
- |
DISALLOW_COPY_AND_ASSIGN(CertStoreImpl); |
}; |