Add GetSystemNSSKeySlot, merge GetPrivateNSSKeySlot/GetPublicNSSKeySlot to GetPersistentNSSKeySlot.

net/socket/ssl_server_socket_nss.cc

Index: net/socket/ssl_server_socket_nss.cc
diff --git a/net/socket/ssl_server_socket_nss.cc b/net/socket/ssl_server_socket_nss.cc
index cfdc5c545ef894b992722d24aedb89c49aa9f0f2..3911f67644039006289cb9accba9b2e424f28fdc 100644
--- a/net/socket/ssl_server_socket_nss.cc
+++ b/net/socket/ssl_server_socket_nss.cc
@@ -446,7 +446,7 @@ int SSLServerSocketNSS::InitializeSSLOptions() {
   }
 
   SECKEYPrivateKeyStr* private_key = NULL;
-  PK11SlotInfo* slot = crypto::GetPrivateNSSKeySlot();
+  PK11SlotInfo* slot = PK11_GetInternalSlot();

[pneubeck (no reviews), 2014/07/10 09:44:11]

This changed from PK11_GetInternalKeySlot to PK11_GetInternalSlot, which seems
fine according to the descriptions that I could find.

If I understand GetInternalSlot correctly, then this slot is a temporary,
not-persistent one provided by NSS that doesn't require authentication?

[mattm, 2014/07/10 22:20:45]

Right. This function only imports a temporary key, so doesn't need a persistent
slot.

   if (!slot) {
     CERT_DestroyCertificate(cert);
     return ERR_UNEXPECTED;