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>
 #include <secmod.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list_threadsafe.h"
 #include "base/task_runner.h"
 #include "base/task_runner_util.h"
 #include "base/threading/worker_pool.h"
 #include "crypto/nss_util.h"
 #include "crypto/nss_util_internal.h"
 #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"
 
 // In NSS 3.13, CERTDB_VALID_PEER was renamed CERTDB_TERMINAL_RECORD. So we use
 // the new name of the macro.
 #if !defined(CERTDB_TERMINAL_RECORD)
 #define CERTDB_TERMINAL_RECORD CERTDB_VALID_PEER
 #endif
 
@@ skipping 23 matching lines @@
 #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);
+  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();
 }
 
 NSSCertDatabase::~NSSCertDatabase() {}
 
 void NSSCertDatabase::ListCertsSync(CertificateList* certs) {
   ListCertsImpl(crypto::ScopedPK11Slot(), certs);
 }
 
 void NSSCertDatabase::ListCerts(
@@ skipping 270 matching lines @@
 bool NSSCertDatabase::IsReadOnly(const X509Certificate* cert) const {
   PK11SlotInfo* slot = cert->os_cert_handle()->slot;
   return slot && PK11_IsReadOnly(slot);
 }
 
 bool NSSCertDatabase::IsHardwareBacked(const X509Certificate* cert) const {
   PK11SlotInfo* slot = cert->os_cert_handle()->slot;
   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);
 }
 
 void NSSCertDatabase::SetSlowTaskRunnerForTest(
     const scoped_refptr<base::TaskRunner>& task_runner) {
   slow_task_runner_for_test_ = task_runner;
 }
 
 // static
 void NSSCertDatabase::ListCertsImpl(crypto::ScopedPK11Slot slot,
@@ skipping 63 matching lines @@
   } else {
     if (SEC_DeletePermCertificate(cert->os_cert_handle())) {
       LOG(ERROR) << "SEC_DeletePermCertificate failed: " << PORT_GetError();
       return false;
     }
   }
   return true;
 }
 
 }  // namespace net