Fixes leak of CertStore on shutdown.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/18568

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8599 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 5 deletions

diff --git a/chrome/browser/cert_store.h b/chrome/browser/cert_store.h
index 48b53ef..8c793b2 100644
--- a/chrome/browser/cert_store.h
+++ b/chrome/browser/cert_store.h
@@ -9,6 +9,7 @@
 #include <map>
 
 #include "base/lock.h"
+#include "base/singleton.h"
 #include "chrome/common/notification_service.h"
 #include "net/base/x509_certificate.h"
 
@@ -24,9 +25,6 @@
 
 class CertStore : public NotificationObserver {
  public:
-  // Creates the singleton instance.  Should be called from the UI thread.
-  static void Initialize();
-
   // Returns the singleton instance of the CertStore.
   static CertStore* GetSharedInstance();
 
@@ -48,6 +46,8 @@ class CertStore : public NotificationObserver {
                        const NotificationDetails& details);
 
  private:
+  friend struct DefaultSingletonTraits<CertStore>;
+
   CertStore();
   ~CertStore();
 
@@ -58,8 +58,6 @@ class CertStore : public NotificationObserver {
   // Removes all the certs associated with the specified process from the store.
   void RemoveCertsForRenderProcesHost(int render_process_host_id);
 
-  static CertStore* instance_;
-
   typedef std::multimap<int, int> IDMap;
   typedef std::map<int, scoped_refptr<net::X509Certificate> > CertMap;
   typedef std::map<net::X509Certificate*, int, net::X509Certificate::LessThan>