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

chrome/browser/ssl/ssl_add_cert_handler.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 "chrome/browser/ssl/ssl_add_cert_handler.h"
 
 #include "base/bind.h"
 #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ skipping 21 matching lines @@
   AddRef();
   // Delay adding the certificate until the next mainloop iteration.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&SSLAddCertHandler::Run, this));
 }
 
 SSLAddCertHandler::~SSLAddCertHandler() {}
 
 void SSLAddCertHandler::Run() {
-  int cert_error;
-  {
-    net::CertDatabase db;
-    cert_error = db.CheckUserCert(cert_);
-  }
+  int cert_error = net::CertDatabase::GetInstance()->CheckUserCert(cert_);
   if (cert_error != net::OK) {
     LOG_IF(ERROR, cert_error == net::ERR_NO_PRIVATE_KEY_FOR_CERT)
         << "No corresponding private key in store for cert: "
         << (cert_.get() ? cert_->subject().GetDisplayName() : "NULL");
 
     BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(
           &SSLAddCertHandler::CallVerifyClientCertificateError, this,
           cert_error));
@@ skipping 10 matching lines @@
 
 #if !defined(OS_MACOSX)
 void SSLAddCertHandler::AskToAddCert() {
   // TODO(snej): Someone should add Windows and GTK implementations with UI.
   Finished(true);
 }
 #endif
 
 void SSLAddCertHandler::Finished(bool add_cert) {
   int cert_error = net::OK;
-  if (add_cert) {
-    net::CertDatabase db;
-    cert_error = db.AddUserCert(cert_);
-  }
+  if (add_cert)
+    cert_error = net::CertDatabase::GetInstance()->AddUserCert(cert_);
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(
           &SSLAddCertHandler::CallAddClientCertificate, this,
           add_cert, cert_error));
 
   Release();
 }
 
@@ skipping 17 matching lines @@
   TabContents* tab_contents = TabContents::FromWebContents(tab);
   if (add_cert) {
     if (cert_error == net::OK) {
       tab_contents->ssl_helper()->OnAddClientCertificateSuccess(this);
     } else {
       tab_contents->ssl_helper()->OnAddClientCertificateError(this, cert_error);
     }
   }
   tab_contents->ssl_helper()->OnAddClientCertificateFinished(this);
 }