Avoid locking cert_lock_ again from the same thread....

chrome/browser/cert_store.h

 // Copyright (c) 2006-2008 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.
 
 #ifndef CHROME_BROWSER_CERT_STORE_H_
 #define CHROME_BROWSER_CERT_STORE_H_
 
 #include <vector>
 #include <map>
 
@@ skipping 34 matching lines @@
   // NotificationObserver implementation.
   virtual void Observe(NotificationType type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
  private:
   CertStore();
   ~CertStore();
 
   // Remove the specified cert from id_to_cert_ and cert_to_id_.
-  void RemoveCert(int cert_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);
 
   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>
       ReverseCertMap;
 
   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_.
   Lock cert_lock_;
 
   DISALLOW_EVIL_CONSTRUCTORS(CertStore);
 };
 
 #endif  // CHROME_BROWSER_CERT_STORE_H_