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

base/crypto/crypto_module_blocking_password_delegate.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_CRYPTO_PK11_BLOCKING_PASSWORD_DELEGATE_H_
-#define BASE_CRYPTO_PK11_BLOCKING_PASSWORD_DELEGATE_H_
+#ifndef BASE_CRYPTO_CRYPTO_MODULE_BLOCKING_PASSWORD_DELEGATE_H_
+#define BASE_CRYPTO_CRYPTO_MODULE_BLOCKING_PASSWORD_DELEGATE_H_
 #pragma once
 
 #include <string>
 
 namespace base {
 
 // PK11_SetPasswordFunc is a global setting.  An implementation of
-// PK11BlockingPasswordDelegate should be passed as the user data argument
-// (|wincx|) to relevant NSS functions, which the global password handler will
-// call to do the actual work.
-class PK11BlockingPasswordDelegate {
+// CryptoModuleBlockingPasswordDelegate should be passed as the user data
+// argument (|wincx|) to relevant NSS functions, which the global password
+// handler will call to do the actual work.
+class CryptoModuleBlockingPasswordDelegate {

[wtc, 2011/01/15 17:40:40]

If this class is and will remain NSS-specific, it is fine
to use "PKCS11" instead of "CryptoModule" in its name.
I guess this class will also be used by the use_openssl
build?

[mattm, 2011/01/19 00:59:34]

Yeah, openssl will use it too 

  public:
-  virtual ~PK11BlockingPasswordDelegate() {}
+  virtual ~CryptoModuleBlockingPasswordDelegate() {}
 
   // Requests a password to unlock |slot_name|. The interface is
   // synchronous because NSS cannot issue an asynchronous
   // request. |retry| is true if this is a request for the retry
   // and we previously returned the wrong password.
   // The implementation should set |*cancelled| to true if the user cancelled
   // instead of entering a password, otherwise it should return the password the
   // user entered.
   virtual std::string RequestPassword(const std::string& slot_name, bool retry,
                                       bool* cancelled) = 0;
 };
 
 }
 
-#endif  // BASE_CRYPTO_PK11_BLOCKING_PASSWORD_DELEGATE_H_
+#endif  // BASE_CRYPTO_CRYPTO_MODULE_BLOCKING_PASSWORD_DELEGATE_H_