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

base/nss_util.cc

Index: base/nss_util.cc
diff --git a/base/nss_util.cc b/base/nss_util.cc
index da678f0518a04a62f66fe2767985afd320b83f0e..384cc0da9c3be2c1d5d0d16b41edc79253946b90 100644
--- a/base/nss_util.cc
+++ b/base/nss_util.cc
@@ -29,7 +29,7 @@
 // use NSS for crypto or certificate verification, and we don't use the NSS
 // certificate and key databases.
 #if defined(USE_NSS)
-#include "base/crypto/pk11_blocking_password_delegate.h"
+#include "base/crypto/crypto_module_blocking_password_delegate.h"
 #include "base/environment.h"
 #include "base/lock.h"
 #include "base/scoped_ptr.h"
@@ -71,10 +71,10 @@ FilePath GetInitialConfigDirectory() {
 }
 
 // This callback for NSS forwards all requests to a caller-specified
-// PK11BlockingPasswordDelegate object.
-char* PK11PasswordFunc(PK11SlotInfo* slot, PRBool retry, void* arg) {
-  base::PK11BlockingPasswordDelegate* delegate =
-      reinterpret_cast<base::PK11BlockingPasswordDelegate*>(arg);
+// CryptoModuleBlockingPasswordDelegate object.
+char* PKCS11PasswordFunc(PK11SlotInfo* slot, PRBool retry, void* arg) {
+  base::CryptoModuleBlockingPasswordDelegate* delegate =
+      reinterpret_cast<base::CryptoModuleBlockingPasswordDelegate*>(arg);
   if (delegate) {
     bool cancelled = false;
     std::string password = delegate->RequestPassword(PK11_GetTokenName(slot),
@@ -274,7 +274,7 @@ class NSSInitSingleton {
       }
     }
 
-    PK11_SetPasswordFunc(PK11PasswordFunc);
+    PK11_SetPasswordFunc(PKCS11PasswordFunc);
 
     // If we haven't initialized the password for the NSS databases,
     // initialize an empty-string password so that we don't need to