Cleanup unreachable cert adding code

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 8d143a71298c8fe9bf3a557b0da43ae307adebbe..6842643d5f68e6ee5cfc5dd03c76d1701dc65c0a 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,18 @@ int NSSCertDatabase::ImportUserCert(const std::string& data) {
   int result = psm::ImportUserCert(certificates);
 
   if (result == OK)
-    NotifyObserversOfCertAdded(NULL);
+    NotifyObserversCertDBChanged(NULL);
+
+  return result;
+}
+
+int NSSCertDatabase::ImportUserCert(X509Certificate* certificate) {
+  CertificateList certificates;
+  certificates.emplace_back(certificate);
+  int result = psm::ImportUserCert(certificates);
+
+  if (result == OK)
+    NotifyObserversCertDBChanged(NULL);
 
   return result;
 }
@@ -254,7 +256,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 +374,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 +382,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 +453,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));
 }