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

net/socket/client_socket_pool_manager_impl.cc

 // Copyright (c) 2012 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.
 
 #include "net/socket/client_socket_pool_manager_impl.h"
 
 #include "base/logging.h"
 #include "base/values.h"
 #include "net/base/ssl_config_service.h"
 #include "net/http/http_proxy_client_socket_pool.h"
@@ skipping 65 matching lines @@
           NULL /* no http proxy */,
           ssl_config_service,
           net_log)),
       transport_for_socks_pool_histograms_("TCPforSOCKS"),
       socks_pool_histograms_("SOCK"),
       transport_for_http_proxy_pool_histograms_("TCPforHTTPProxy"),
       transport_for_https_proxy_pool_histograms_("TCPforHTTPSProxy"),
       ssl_for_https_proxy_pool_histograms_("SSLforHTTPSProxy"),
       http_proxy_pool_histograms_("HTTPProxy"),
       ssl_socket_pool_for_proxies_histograms_("SSLForProxies") {
-  CertDatabase::AddObserver(this);
+  CertDatabase::GetInstance()->AddObserver(this);
 }
 
 ClientSocketPoolManagerImpl::~ClientSocketPoolManagerImpl() {
-  CertDatabase::RemoveObserver(this);
+  CertDatabase::GetInstance()->RemoveObserver(this);
 }
 
 void ClientSocketPoolManagerImpl::FlushSocketPools() {
   // Flush the highest level pools first, since higher level pools may release
   // stuff to the lower level pools.
 
   for (SSLSocketPoolMap::const_iterator it =
        ssl_socket_pools_for_proxies_.begin();
        it != ssl_socket_pools_for_proxies_.end();
        ++it)
@@ skipping 263 matching lines @@
 
   // Third parameter is false because |ssl_socket_pools_for_proxies_| use
   // socket pools in |http_proxy_socket_pools_| and |socks_socket_pools_|.
   AddSocketPoolsToList(list,
                        ssl_socket_pools_for_proxies_,
                        "ssl_socket_pool_for_proxies",
                        false);
   return list;
 }
 
-void ClientSocketPoolManagerImpl::OnUserCertAdded(const X509Certificate* cert) {
+void ClientSocketPoolManagerImpl::OnCertAdded(const X509Certificate* cert) {
   FlushSocketPools();
 }
 
 void ClientSocketPoolManagerImpl::OnCertTrustChanged(
     const X509Certificate* cert) {
   // We should flush the socket pools if we removed trust from a
   // cert, because a previously trusted server may have become
   // untrusted.
   //
   // We should not flush the socket pools if we added trust to a
   // cert.
   //
   // Since the OnCertTrustChanged method doesn't tell us what
   // kind of trust change it is, we have to flush the socket
   // pools to be safe.
   FlushSocketPools();
 }
 
 }  // namespace net