Cleanup: replace usage of "pk11" with "pkcs11" or "crypto module", as appropriate.

net/base/keygen_handler_nss.cc

Index: net/base/keygen_handler_nss.cc
diff --git a/net/base/keygen_handler_nss.cc b/net/base/keygen_handler_nss.cc
index a3505c40db45de5473d74a27af7c8cd1dfc54697..74fb9a64e411b87b8379d4239f23ccf2b218f6c2 100644
--- a/net/base/keygen_handler_nss.cc
+++ b/net/base/keygen_handler_nss.cc
@@ -4,7 +4,7 @@
 
 #include "net/base/keygen_handler.h"
 
-#include "base/crypto/pk11_blocking_password_delegate.h"
+#include "base/crypto/crypto_module_blocking_password_delegate.h"
 #include "base/crypto/scoped_nss_types.h"
 #include "base/logging.h"
 #include "base/nss_util.h"
@@ -29,7 +29,7 @@ std::string KeygenHandler::GenKeyAndSignChallenge() {
 
   // Authenticate to the token.
   if (SECSuccess != PK11_Authenticate(slot.get(), PR_TRUE,
-                                      pk11_password_delegate_.get())) {
+                                      crypto_module_password_delegate_.get())) {
     LOG(ERROR) << "Couldn't authenticate to internal key slot!";
     return std::string();
   }
@@ -38,9 +38,9 @@ std::string KeygenHandler::GenKeyAndSignChallenge() {
                                      slot.get(), stores_key_);
 }
 
-void KeygenHandler::set_pk11_password_delegate(
-    base::PK11BlockingPasswordDelegate* delegate) {
-  pk11_password_delegate_.reset(delegate);
+void KeygenHandler::set_crypto_module_password_delegate(
+    base::CryptoModuleBlockingPasswordDelegate* delegate) {
+  crypto_module_password_delegate_.reset(delegate);
 }
 
 }  // namespace net