This applies GUIDs to certificate and key nicknames when

net/base/cert_database.h

Index: net/base/cert_database.h
diff --git a/net/base/cert_database.h b/net/base/cert_database.h
index a735e6937c9c97ab77abfe931d462e6ade6be9e0..cfd670c412410654c8845fc2fb54e6560ed1c916 100644
--- a/net/base/cert_database.h
+++ b/net/base/cert_database.h
@@ -99,8 +99,8 @@ class NET_EXPORT CertDatabase {
   int AddUserCert(X509Certificate* cert);
 
 #if defined(USE_NSS) || defined(USE_OPENSSL)
-  // Get a list of unique certificates in the certificate database.  (One
-  // instance of all certificates.)
+  // Get a list of unique certificates in the certificate database (one
+  // instance of all certificates).
   void ListCerts(CertificateList* certs);
 
   // Get the default module for public key data.
@@ -119,11 +119,13 @@ class NET_EXPORT CertDatabase {
   // If |is_extractable| is false, mark the private key as being unextractable
   // from the module.
   // Returns OK or a network error code such as ERR_PKCS12_IMPORT_BAD_PASSWORD
-  // or ERR_PKCS12_IMPORT_ERROR.
+  // or ERR_PKCS12_IMPORT_ERROR. |imported_certs|, if non-NULL, returns a list
+  // of certs that were imported.
   int ImportFromPKCS12(CryptoModule* module,
                        const std::string& data,
                        const string16& password,
-                       bool is_extractable);
+                       bool is_extractable,
+                       CertificateList* imported_certs);
 
   // Export the given certificates and private keys into a PKCS #12 blob,
   // storing into |output|.
@@ -178,12 +180,6 @@ class NET_EXPORT CertDatabase {
   // success.
   bool DeleteCertAndKey(const X509Certificate* cert);
 
-  // Delete the certificate and associated public and private key (if
-  // one exists) with the given label from the database.  Returns true
-  // on success.  ("label" here refers to the NSS Attribute CKA_LABEL,
-  // also referred to as a nickname or friendly name).
-  bool DeleteCertAndKeyByLabel(const std::string& label);
-
   // Check whether cert is stored in a readonly slot.
   bool IsReadOnly(const X509Certificate* cert) const;
 #endif