This fixes a bug I introduced last night with

fetching the default nickname.

BUG=none
TEST=imported user certs successfully.


Review URL: http://codereview.chromium.org/8919020

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114150 0039d316-1c4b-4281-b951-d872f2087c98

net/base/cert_database_nss.cc

@@ -64,7 +64,6 @@ int CertDatabase::CheckUserCert(X509Certificate* cert_obj) {
 int CertDatabase::AddUserCert(X509Certificate* cert_obj) {
   CERTCertificate* cert = cert_obj->os_cert_handle();
   PK11SlotInfo* slot = NULL;
-  std::string nickname;
 
   {
     crypto::AutoNSSWriteLock lock;

net/base/x509_certificate_nss.cc

@@ -710,7 +710,7 @@ std::string X509Certificate::GetDefaultNickname(CertType type) const {
     return default_nickname_;
 
   std::string result;
-  if (type == USER_CERT) {
+  if (type == USER_CERT && cert_handle_->slot) {
     // Find the private key for this certificate and see if it has a
     // nickname.  If there is a private key, and it has a nickname, then
     // we return that nickname.