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

net/spdy/spdy_session_pool.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/spdy/spdy_session_pool.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/values.h"
@@ skipping 37 matching lines @@
     : http_server_properties_(http_server_properties),
       ssl_config_service_(ssl_config_service),
       resolver_(resolver),
       verify_domain_authentication_(true),
       enable_sending_initial_settings_(true),
       trusted_spdy_proxy_(
           HostPortPair::FromString(trusted_spdy_proxy)) {
   NetworkChangeNotifier::AddIPAddressObserver(this);
   if (ssl_config_service_)
     ssl_config_service_->AddObserver(this);
-  CertDatabase::AddObserver(this);
+  CertDatabase::GetInstance()->AddObserver(this);
 }
 
 SpdySessionPool::~SpdySessionPool() {
   CloseAllSessions();
 
   if (ssl_config_service_)
     ssl_config_service_->RemoveObserver(this);
   NetworkChangeNotifier::RemoveIPAddressObserver(this);
-  CertDatabase::RemoveObserver(this);
+  CertDatabase::GetInstance()->RemoveObserver(this);
 }
 
 scoped_refptr<SpdySession> SpdySessionPool::Get(
     const HostPortProxyPair& host_port_proxy_pair,
     const BoundNetLog& net_log) {
   return GetInternal(host_port_proxy_pair, net_log, false);
 }
 
 scoped_refptr<SpdySession> SpdySessionPool::GetIfExists(
     const HostPortProxyPair& host_port_proxy_pair,
@@ skipping 224 matching lines @@
         UMA_HISTOGRAM_ENUMERATION("Net.SpdyIPPoolDomainMatch", 0, 2);
       continue;
     }
     if (record_histograms)
       UMA_HISTOGRAM_ENUMERATION("Net.SpdyIPPoolDomainMatch", 1, 2);
     return spdy_session;
   }
   return NULL;
 }
 
-void SpdySessionPool::OnUserCertAdded(const X509Certificate* cert) {
+void SpdySessionPool::OnCertAdded(const X509Certificate* cert) {
   CloseCurrentSessions();
 }
 
 void SpdySessionPool::OnCertTrustChanged(const X509Certificate* cert) {
   // Per wtc, we actually only need to CloseCurrentSessions when trust is
   // reduced. CloseCurrentSessions now because OnCertTrustChanged does not
   // tell us this.
   // See comments in ClientSocketPoolManager::OnCertTrustChanged.
   CloseCurrentSessions();
 }
@@ skipping 129 matching lines @@
     const scoped_refptr<SpdySession>& session = *session_it;
     CHECK(session);
     if (!session->is_active()) {
       session->CloseSessionOnError(
           net::ERR_ABORTED, true, "Closing idle sessions.");
     }
   }
 }
 
 }  // namespace net