Move the NSS functions out of CertDatabase into a new NSSCertDatabase class.

net/socket/client_socket_pool_manager_impl.cc

Index: net/socket/client_socket_pool_manager_impl.cc
diff --git a/net/socket/client_socket_pool_manager_impl.cc b/net/socket/client_socket_pool_manager_impl.cc
index b67ad0d1ee13999ba24507ab3912c1bf3a606c63..d70827efab37107794618f31acb873328d25cec8 100644
--- a/net/socket/client_socket_pool_manager_impl.cc
+++ b/net/socket/client_socket_pool_manager_impl.cc
@@ -83,11 +83,13 @@ ClientSocketPoolManagerImpl::ClientSocketPoolManagerImpl(
       ssl_for_https_proxy_pool_histograms_("SSLforHTTPSProxy"),
       http_proxy_pool_histograms_("HTTPProxy"),
       ssl_socket_pool_for_proxies_histograms_("SSLForProxies") {
-  CertDatabase::AddObserver(this);
+  CertDatabase cert_db;
+  cert_db.AddObserver(this);
 }
 
 ClientSocketPoolManagerImpl::~ClientSocketPoolManagerImpl() {
-  CertDatabase::RemoveObserver(this);
+  CertDatabase cert_db;
+  cert_db.RemoveObserver(this);
 }
 
 void ClientSocketPoolManagerImpl::FlushSocketPools() {
@@ -371,7 +373,7 @@ Value* ClientSocketPoolManagerImpl::SocketPoolInfoToValue() const {
   return list;
 }
 
-void ClientSocketPoolManagerImpl::OnUserCertAdded(const X509Certificate* cert) {
+void ClientSocketPoolManagerImpl::OnCertAdded(const X509Certificate* cert) {
   FlushSocketPools();
 }