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

BUG=42073
TEST=manual,trybotss

Review URL: http://codereview.chromium.org/6303004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71749 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 13 insertions, 11 deletions

diff --git a/net/base/keygen_handler.cc b/net/base/keygen_handler.cc
index 771ad73..8c88b4d 100644
--- a/net/base/keygen_handler.cc
+++ b/net/base/keygen_handler.cc
@@ -5,14 +5,14 @@
 #include "net/base/keygen_handler.h"
 
 #if defined(USE_NSS)
-#include "base/crypto/pk11_blocking_password_delegate.h"
+#include "base/crypto/crypto_module_blocking_password_delegate.h"
 #endif
 
 namespace net {
 
 // The constructor and destructor must be defined in a .cc file so that
-// PK11BlockingPasswordDelegate can be forward-declared on platforms which use
-// NSS.
+// CryptoModuleBlockingPasswordDelegate can be forward-declared on platforms
+// which use NSS.
 
 KeygenHandler::KeygenHandler(int key_size_in_bits,
                              const std::string& challenge,
diff --git a/net/base/keygen_handler.h b/net/base/keygen_handler.h
index d12d084..817720d 100644
--- a/net/base/keygen_handler.h
+++ b/net/base/keygen_handler.h
@@ -14,7 +14,7 @@
 
 #if defined(USE_NSS)
 namespace base {
-class PK11BlockingPasswordDelegate;
+class CryptoModuleBlockingPasswordDelegate;
 };
 #endif  // defined(USE_NSS)
 
@@ -47,7 +47,8 @@ class KeygenHandler {
   // GenKeyAndSignChallenge runs on a worker thread, so using the blocking
   // password callback is okay here.
   // Takes ownership of the delegate.
-  void set_pk11_password_delegate(base::PK11BlockingPasswordDelegate* delegate);
+  void set_crypto_module_password_delegate(
+      base::CryptoModuleBlockingPasswordDelegate* delegate);
 #endif  // defined(USE_NSS)
 
  private:
@@ -57,7 +58,8 @@ class KeygenHandler {
   bool stores_key_;  // should the generated key-pair be stored persistently?
 #if defined(USE_NSS)
   // The callback for requesting a password to the PKCS#11 token.
-  scoped_ptr<base::PK11BlockingPasswordDelegate> pk11_password_delegate_;
+  scoped_ptr<base::CryptoModuleBlockingPasswordDelegate>
+      crypto_module_password_delegate_;
 #endif  // defined(USE_NSS)
 };
 
diff --git a/net/base/keygen_handler_nss.cc b/net/base/keygen_handler_nss.cc
index a3505c4..74fb9a6 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