This applies GUIDs to certificate and key nicknames when

net/third_party/mozilla_security_manager/nsPKCS12Blob.h

Index: net/third_party/mozilla_security_manager/nsPKCS12Blob.h
diff --git a/net/third_party/mozilla_security_manager/nsPKCS12Blob.h b/net/third_party/mozilla_security_manager/nsPKCS12Blob.h
index ace6baabeb14075b61a0285d6b6ac917efad3bd4..d0c8da1688ade80ea8d4218774034a5a74936357 100644
--- a/net/third_party/mozilla_security_manager/nsPKCS12Blob.h
+++ b/net/third_party/mozilla_security_manager/nsPKCS12Blob.h
@@ -57,13 +57,15 @@ namespace mozilla_security_manager {
 void EnsurePKCS12Init();
 
 // Import the private key and certificate from a PKCS#12 blob into the slot.
-// If |is_extractable| is false, mark the private key as unextractable.
-// Returns a net error code.
+// If |is_extractable| is false, mark the private key as non-extractable.
+// Returns a net error code.  |imported_certs|, if non-NULL, returns a list of
+// certs that were imported.
 int nsPKCS12Blob_Import(PK11SlotInfo* slot,
                         const char* pkcs12_data,
                         size_t pkcs12_len,
                         const string16& password,
-                        bool is_extractable);
+                        bool is_extractable,
+                        net::CertificateList* imported_certs);
 
 // Export the given certificates into a PKCS#12 blob, storing into output.
 // Returns the number of certificates exported.