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

chrome/browser/certificate_manager_model.h

Index: chrome/browser/certificate_manager_model.h
diff --git a/chrome/browser/certificate_manager_model.h b/chrome/browser/certificate_manager_model.h
index b111aa28336f11296410d05d01919e3dedbfac1f..d26d11b2e1116e787be8c8792e2c9b3043ce7c1c 100644
--- a/chrome/browser/certificate_manager_model.h
+++ b/chrome/browser/certificate_manager_model.h
@@ -10,7 +10,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
-#include "net/base/cert_database.h"
+#include "net/base/nss_cert_database.h"
 
 // CertificateManagerModel provides the data to be displayed in the certificate
 // manager dialog, and processes changes from the view.
@@ -40,8 +40,8 @@ class CertificateManagerModel {
   explicit CertificateManagerModel(Observer* observer);
   ~CertificateManagerModel();
 
-  // Accessor for read-only access to the underlying CertDatabase.
-  const net::CertDatabase& cert_db() const { return cert_db_; }
+  // Accessor for read-only access to the underlying NSSCertDatabase.
+  const net::NSSCertDatabase& cert_db() const { return cert_db_; }
 
   // Trigger a refresh of the list of certs, unlock any slots if necessary.
   // Following this call, the observer CertificatesRefreshed method will be
@@ -67,13 +67,13 @@ class CertificateManagerModel {
   // Tries to import all the certificates given.  The root will be trusted
   // according to |trust_bits|.  Any certificates that could not be imported
   // will be listed in |not_imported|.
-  // |trust_bits| should be a bit field of TRUST* values from CertDatabase.
+  // |trust_bits| should be a bit field of TRUST* values from NSSCertDatabase.
   // Returns false if there is an internal error, otherwise true is returned and
   // |not_imported| should be checked for any certificates that were not
   // imported.
   bool 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);
 
   // Import server certificate.  The first cert should be the server cert.  Any
   // additional certs should be intermediate/CA certs and will be imported but
@@ -87,15 +87,15 @@ class CertificateManagerModel {
   // imported.
   bool 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);
 
   // Set trust values for certificate.
-  // |trust_bits| should be a bit field of TRUST* values from CertDatabase.
+  // |trust_bits| should be a bit field of TRUST* values from NSSCertDatabase.
   // Returns true on success or false on failure.
   bool SetCertTrust(const net::X509Certificate* cert,
                     net::CertType type,
-                    net::CertDatabase::TrustBits trust_bits);
+                    net::NSSCertDatabase::TrustBits trust_bits);
 
   // Delete the cert.  Returns true on success.  |cert| is still valid when this
   // function returns.
@@ -111,7 +111,7 @@ class CertificateManagerModel {
   // This method does the actual refreshing.
   void RefreshSlotsUnlocked();
 
-  net::CertDatabase cert_db_;
+  net::NSSCertDatabase cert_db_;
   net::CertificateList cert_list_;
 
   // The observer to notify when certificate list is refreshed.