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

chrome/browser/certificate_manager_model.cc

Index: chrome/browser/certificate_manager_model.cc
diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc
index e44a0b6dfd6b5f38eb393f8e317e7a4685380319..d048427daf0e987c7a93c7dc69696fd36181411d 100644
--- a/chrome/browser/certificate_manager_model.cc
+++ b/chrome/browser/certificate_manager_model.cc
@@ -121,8 +121,8 @@ int CertificateManagerModel::ImportFromPKCS12(net::CryptoModule* module,
 
 bool CertificateManagerModel::ImportCACerts(
     const net::CertificateList& certificates,
-    net::CertDatabase::TrustBits trust_bits,
-    net::CertDatabase::ImportCertFailureList* not_imported) {
+    net::NSSCertDatabase::TrustBits trust_bits,
+    net::NSSCertDatabase::ImportCertFailureList* not_imported) {
   bool result = cert_db_.ImportCACerts(certificates, trust_bits, not_imported);
   if (result && not_imported->size() != certificates.size())
     Refresh();
@@ -131,8 +131,8 @@ bool CertificateManagerModel::ImportCACerts(
 
 bool CertificateManagerModel::ImportServerCert(
     const net::CertificateList& certificates,
-    net::CertDatabase::TrustBits trust_bits,
-    net::CertDatabase::ImportCertFailureList* not_imported) {
+    net::NSSCertDatabase::TrustBits trust_bits,
+    net::NSSCertDatabase::ImportCertFailureList* not_imported) {
   bool result = cert_db_.ImportServerCert(certificates, trust_bits,
                                           not_imported);
   if (result && not_imported->size() != certificates.size())
@@ -143,7 +143,7 @@ bool CertificateManagerModel::ImportServerCert(
 bool CertificateManagerModel::SetCertTrust(
     const net::X509Certificate* cert,
     net::CertType type,
-    net::CertDatabase::TrustBits trust_bits) {
+    net::NSSCertDatabase::TrustBits trust_bits) {
   return cert_db_.SetCertTrust(cert, type, trust_bits);
 }