Break cyclic dependency between CertDatabase and NSSCertDatabase.

net/cert/nss_cert_database.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/nss_cert_database.h"
 
 #include <cert.h>
 #include <certdb.h>
 #include <keyhi.h>
 #include <pk11pub.h>
@@ skipping 24 matching lines @@
 #define CERTDB_TERMINAL_RECORD CERTDB_VALID_PEER
 #endif
 
 // PSM = Mozilla's Personal Security Manager.
 namespace psm = mozilla_security_manager;
 
 namespace net {
 
 namespace {
 
+// Helper that observes events from the NSSCertDatabase and forwards them to
+// the given CertDatabase.
+class CertNotificationForwarder : public NSSCertDatabase::Observer {
+ public:
+  explicit CertNotificationForwarder(CertDatabase* cert_db)
+      : cert_db_(cert_db) {}
+
+  virtual ~CertNotificationForwarder() {}
+
+  // NSSCertDatabase::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(CertNotificationForwarder);
+};
+
 base::LazyInstance<NSSCertDatabase>::Leaky
     g_nss_cert_database = LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 NSSCertDatabase::ImportCertFailure::ImportCertFailure(
     const scoped_refptr<X509Certificate>& cert,
     int err)
     : certificate(cert), net_error(err) {}
 
 NSSCertDatabase::ImportCertFailure::~ImportCertFailure() {}
 
 // static
 NSSCertDatabase* NSSCertDatabase::GetInstance() {
   // TODO(mattm): Remove this ifdef guard once the linux impl of
   // GetNSSCertDatabaseForResourceContext does not call GetInstance.
 #if defined(OS_CHROMEOS)
   LOG(ERROR) << "NSSCertDatabase::GetInstance() is deprecated."
              << "See http://crbug.com/329735.";
 #endif
   return &g_nss_cert_database.Get();
 }
 
 NSSCertDatabase::NSSCertDatabase()
     : observer_list_(new ObserverListThreadSafe<Observer>),
       weak_factory_(this) {
   // This also makes sure that NSS has been initialized.
-  CertDatabase::GetInstance()->ObserveNSSCertDatabase(this);
+  CertDatabase* cert_db = CertDatabase::GetInstance();
+  cert_notification_forwarder_.reset(new CertNotificationForwarder(cert_db));
+  AddObserver(cert_notification_forwarder_.get());
 
   psm::EnsurePKCS12Init();
 }
 
 NSSCertDatabase::~NSSCertDatabase() {}
 
 void NSSCertDatabase::ListCertsSync(CertificateList* certs) {
   ListCertsImpl(crypto::ScopedPK11Slot(), certs);
 }
 
@@ skipping 359 matching lines @@
   } else {
     if (SEC_DeletePermCertificate(cert->os_cert_handle())) {
       LOG(ERROR) << "SEC_DeletePermCertificate failed: " << PORT_GetError();
       return false;
     }
   }
   return true;
 }
 
 }  // namespace net