Adding User Certificate (.crt) Import to Certificate Manager

net/cert/cert_database_nss.cc

Index: net/cert/cert_database_nss.cc
diff --git a/net/cert/cert_database_nss.cc b/net/cert/cert_database_nss.cc
index 49d27f2b07c146813b7cac820705f4b82705976a..1ff8862e20def3049b7417688e8817066370e326 100644
--- a/net/cert/cert_database_nss.cc
+++ b/net/cert/cert_database_nss.cc
@@ -8,6 +8,8 @@
 #include <pk11pub.h>
 #include <secmod.h>
 
+#include <vector>
+
 #include "base/logging.h"
 #include "base/observer_list_threadsafe.h"
 #include "crypto/nss_util.h"
@@ -15,6 +17,10 @@
 #include "net/base/net_errors.h"
 #include "net/cert/x509_certificate.h"
 #include "net/cert/x509_util_nss.h"
+#include "net/third_party/mozilla_security_manager/nsNSSCertificateDB.h"
+
+// PSM = Mozilla's Personal Security Manager.
+namespace psm = mozilla_security_manager;
 
 namespace net {
 
@@ -49,30 +55,9 @@ int CertDatabase::CheckUserCert(X509Certificate* cert_obj) {
 }
 
 int CertDatabase::AddUserCert(X509Certificate* cert_obj) {
-  CERTCertificate* cert = cert_obj->os_cert_handle();
-  CK_OBJECT_HANDLE key;
-  crypto::ScopedPK11Slot slot(PK11_KeyForCertExists(cert, &key, NULL));
-  if (!slot.get())
-    return ERR_NO_PRIVATE_KEY_FOR_CERT;
-
-  std::string nickname = x509_util::GetUniqueNicknameForSlot(
-      cert_obj->GetDefaultNickname(USER_CERT),
-      &cert->derSubject,
-      slot.get());
-
-  SECStatus rv;
-  {
-    crypto::AutoNSSWriteLock lock;
-    rv = PK11_ImportCert(slot.get(), cert, key, nickname.c_str(), PR_FALSE);
-  }
-
-  if (rv != SECSuccess) {
-    LOG(ERROR) << "Couldn't import user certificate. " << PORT_GetError();
-    return ERR_ADD_USER_CERT_FAILED;
-  }
-
-  NotifyObserversOfCertAdded(cert_obj);
-  return OK;
+  CertificateList cert_list;
+  cert_list.push_back(cert_obj);
+  return psm::ImportUserCert(cert_list);
 }
 
 }  // namespace net