*WIP* Store NSS slots per profile. Move keygen to chrome.

net/cert/cert_database_nss.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/cert/cert_database.h"
 
 #include <cert.h>
 #include <pk11pub.h>
 #include <secmod.h>
 
 #include "base/logging.h"
 #include "base/observer_list_threadsafe.h"
 #include "crypto/nss_util.h"
 #include "crypto/scoped_nss_types.h"
 #include "net/base/net_errors.h"
 #include "net/cert/nss_cert_database.h"
 #include "net/cert/x509_certificate.h"
 #include "net/cert/x509_util_nss.h"
 
 namespace net {
 
-// Helper that observes events from the NSSCertDatabase and forwards them to
+// Helper that observes events from a CertDatabaseSource and forwards them to
 // the given CertDatabase.
-class CertDatabase::Notifier : public NSSCertDatabase::Observer {
+class CertDatabase::Notifier : public CertDatabaseSource::Observer {
  public:
-  explicit Notifier(CertDatabase* cert_db) : cert_db_(cert_db) {
-    NSSCertDatabase::GetInstance()->AddObserver(this);
-  }
+  Notifier(CertDatabase* cert_db) : cert_db_(cert_db) {}
 
-  virtual ~Notifier() {
-    NSSCertDatabase::GetInstance()->RemoveObserver(this);
-  }
+  virtual ~Notifier() {}
 
-  // NSSCertDatabase::Observer implementation:
+  // CertDatabaseSource::Observer implementation:
   virtual void OnCertAdded(const X509Certificate* cert) OVERRIDE {
     cert_db_->NotifyObserversOfCertAdded(cert);
   }
 
   virtual void OnCertRemoved(const X509Certificate* cert) OVERRIDE {
     cert_db_->NotifyObserversOfCertRemoved(cert);
   }
 
   virtual void OnCACertChanged(const X509Certificate* cert) OVERRIDE {
     cert_db_->NotifyObserversOfCACertChanged(cert);
   }
 
  private:
   CertDatabase* cert_db_;
 
   DISALLOW_COPY_AND_ASSIGN(Notifier);
 };
 
 CertDatabase::CertDatabase()
-    : observer_list_(new ObserverListThreadSafe<Observer>) {
-  // Observe NSSCertDatabase events and forward them to observers of
-  // CertDatabase. This also makes sure that NSS has been initialized.
-  notifier_.reset(new Notifier(this));
+    : observer_list_(new ObserverListThreadSafe<Observer>),
+      notifier_(new Notifier(this)) {
+  crypto::EnsureNSSInit();
 }
 
 CertDatabase::~CertDatabase() {}
 
 int CertDatabase::CheckUserCert(X509Certificate* cert_obj) {
   if (!cert_obj)
     return ERR_CERT_INVALID;
   if (cert_obj->HasExpired())
     return ERR_CERT_DATE_INVALID;
 
@@ skipping 34 matching lines @@
 
   if (rv != SECSuccess) {
     LOG(ERROR) << "Couldn't import user certificate. " << PORT_GetError();
     return ERR_ADD_USER_CERT_FAILED;
   }
 
   NotifyObserversOfCertAdded(cert_obj);
   return OK;
 }
 
+void CertDatabase::AddSource(CertDatabaseSource* source) {
+  source->AddObserver(this->notifier_.get());
+}
+
 }  // namespace net