Index: net/cert/nss_cert_database.cc |
diff --git a/net/cert/nss_cert_database.cc b/net/cert/nss_cert_database.cc |
index 8d143a71298c8fe9bf3a557b0da43ae307adebbe..6f75240486760db5a6db7fa89e47ebd1c0e7881f 100644 |
--- a/net/cert/nss_cert_database.cc |
+++ b/net/cert/nss_cert_database.cc |
@@ -53,17 +53,8 @@ class CertNotificationForwarder : public NSSCertDatabase::Observer { |
~CertNotificationForwarder() override {} |
- // NSSCertDatabase::Observer implementation: |
- void OnCertAdded(const X509Certificate* cert) override { |
- cert_db_->NotifyObserversOfCertAdded(cert); |
- } |
- |
- void OnCertRemoved(const X509Certificate* cert) override { |
- cert_db_->NotifyObserversOfCertRemoved(cert); |
- } |
- |
- void OnCACertChanged(const X509Certificate* cert) override { |
- cert_db_->NotifyObserversOfCACertChanged(cert); |
+ void OnCertDBChanged(const X509Certificate* cert) override { |
+ cert_db_->NotifyObserversCertDBChanged(cert); |
} |
private: |
@@ -199,7 +190,7 @@ int NSSCertDatabase::ImportFromPKCS12(CryptoModule* module, |
is_extractable, |
imported_certs); |
if (result == OK) |
- NotifyObserversOfCertAdded(NULL); |
+ NotifyObserversCertDBChanged(NULL); |
return result; |
} |
@@ -241,7 +232,7 @@ int NSSCertDatabase::ImportUserCert(const std::string& data) { |
int result = psm::ImportUserCert(certificates); |
if (result == OK) |
- NotifyObserversOfCertAdded(NULL); |
+ NotifyObserversCertDBChanged(NULL); |
return result; |
} |
@@ -254,7 +245,7 @@ bool NSSCertDatabase::ImportCACerts(const CertificateList& certificates, |
bool success = psm::ImportCACerts( |
slot.get(), certificates, root, trust_bits, not_imported); |
if (success) |
- NotifyObserversOfCACertChanged(NULL); |
+ NotifyObserversCertDBChanged(NULL); |
return success; |
} |
@@ -372,7 +363,7 @@ bool NSSCertDatabase::SetCertTrust(const X509Certificate* cert, |
TrustBits trust_bits) { |
bool success = psm::SetCertTrust(cert, type, trust_bits); |
if (success) |
- NotifyObserversOfCACertChanged(cert); |
+ NotifyObserversCertDBChanged(cert); |
return success; |
} |
@@ -380,7 +371,7 @@ bool NSSCertDatabase::SetCertTrust(const X509Certificate* cert, |
bool NSSCertDatabase::DeleteCertAndKey(X509Certificate* cert) { |
if (!DeleteCertAndKeyImpl(cert)) |
return false; |
- NotifyObserversOfCertRemoved(cert); |
+ NotifyObserversCertDBChanged(cert); |
return true; |
} |
@@ -451,24 +442,13 @@ void NSSCertDatabase::NotifyCertRemovalAndCallBack( |
const DeleteCertCallback& callback, |
bool success) { |
if (success) |
- NotifyObserversOfCertRemoved(cert.get()); |
+ NotifyObserversCertDBChanged(cert.get()); |
callback.Run(success); |
} |
-void NSSCertDatabase::NotifyObserversOfCertAdded(const X509Certificate* cert) { |
- observer_list_->Notify(FROM_HERE, &Observer::OnCertAdded, |
- base::RetainedRef(cert)); |
-} |
- |
-void NSSCertDatabase::NotifyObserversOfCertRemoved( |
- const X509Certificate* cert) { |
- observer_list_->Notify(FROM_HERE, &Observer::OnCertRemoved, |
- base::RetainedRef(cert)); |
-} |
- |
-void NSSCertDatabase::NotifyObserversOfCACertChanged( |
+void NSSCertDatabase::NotifyObserversCertDBChanged( |
const X509Certificate* cert) { |
- observer_list_->Notify(FROM_HERE, &Observer::OnCACertChanged, |
+ observer_list_->Notify(FROM_HERE, &Observer::OnCertDBChanged, |
base::RetainedRef(cert)); |
} |