Break cyclic dependency between CertDatabase and NSSCertDatabase.

net/cert/nss_cert_database.cc

Index: net/cert/nss_cert_database.cc
diff --git a/net/cert/nss_cert_database.cc b/net/cert/nss_cert_database.cc
index c1fc4f9d0cca66473b792a447aeb846fd8b15a24..b1981688416d5870c2fa8c1cacba3ee26804dab2 100644
--- a/net/cert/nss_cert_database.cc
+++ b/net/cert/nss_cert_database.cc
@@ -24,7 +24,6 @@
 #include "crypto/scoped_nss_types.h"
 #include "net/base/crypto_module.h"
 #include "net/base/net_errors.h"
-#include "net/cert/cert_database.h"
 #include "net/cert/x509_certificate.h"
 #include "net/third_party/mozilla_security_manager/nsNSSCertificateDB.h"
 #include "net/third_party/mozilla_security_manager/nsPKCS12Blob.h"
@@ -68,9 +67,9 @@ NSSCertDatabase* NSSCertDatabase::GetInstance() {
 NSSCertDatabase::NSSCertDatabase()
     : observer_list_(new ObserverListThreadSafe<Observer>),
       weak_factory_(this) {
-  // This also makes sure that NSS has been initialized.
-  CertDatabase::GetInstance()->ObserveNSSCertDatabase(this);
+  AddObserver(CertDatabase::GetInstance()->GetObserver());
 
+  // This makes sure that NSS has been initialized.

[mattm, 2014/07/08 21:13:06]

previous comment was correct (CertDatabase constructor calls
crypto::EnsureNSSInit())

   psm::EnsurePKCS12Init();
 }
 
@@ -361,11 +360,11 @@ bool NSSCertDatabase::IsHardwareBacked(const X509Certificate* cert) const {
   return slot && PK11_IsHW(slot);
 }
 
-void NSSCertDatabase::AddObserver(Observer* observer) {
+void NSSCertDatabase::AddObserver(CertDatabase::Observer* observer) {
   observer_list_->AddObserver(observer);
 }
 
-void NSSCertDatabase::RemoveObserver(Observer* observer) {
+void NSSCertDatabase::RemoveObserver(CertDatabase::Observer* observer) {
   observer_list_->RemoveObserver(observer);
 }