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

net/socket/client_socket_factory.cc

Index: net/socket/client_socket_factory.cc
diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc
index f35431768d19e3e334b03334b477016e3c965cc4..2d433b09037732a1e772438ea37784596af776ed 100644
--- a/net/socket/client_socket_factory.cc
+++ b/net/socket/client_socket_factory.cc
@@ -55,16 +55,18 @@ class DefaultClientSocketFactory : public ClientSocketFactory,
               base::SequencedWorkerPool::CONTINUE_ON_SHUTDOWN);
     }
 
-    CertDatabase::AddObserver(this);
+    CertDatabase cert_db;
+    cert_db.AddObserver(this);
   }
 
   virtual ~DefaultClientSocketFactory() {
     // Note: This code never runs, as the factory is defined as a Leaky
     // singleton.
-    CertDatabase::RemoveObserver(this);
+    CertDatabase cert_db;
+    cert_db.RemoveObserver(this);
   }
 
-  virtual void OnUserCertAdded(const X509Certificate* cert) OVERRIDE {
+  virtual void OnCertAdded(const X509Certificate* cert) OVERRIDE {
     ClearSSLSessionCache();
   }