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

chrome/browser/renderer_host/render_message_filter.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/renderer_host/render_message_filter.h"
 
 #include <map>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
@@ skipping 67 matching lines @@
 #include "chrome/common/font_descriptor_mac.h"
 #include "chrome/common/font_loader_mac.h"
 #endif
 #if defined(OS_POSIX)
 #include "base/file_descriptor_posix.h"
 #endif
 #if defined(OS_WIN)
 #include "chrome/common/child_process_host.h"
 #endif
 #if defined(USE_NSS)
-#include "chrome/browser/ui/pk11_password_dialog.h"
+#include "chrome/browser/ui/crypto_module_password_dialog.h"
 #endif
 #if defined(USE_TCMALLOC)
 #include "chrome/browser/browser_about_handler.h"
 #endif
 
 using net::CookieStore;
 using WebKit::WebCache;
 
 namespace {
 
@@ skipping 1283 matching lines @@
     const std::string& challenge_string,
     const GURL& url,
     IPC::Message* reply_msg) {
   DCHECK(reply_msg);
 
   // Generate a signed public key and challenge, then send it back.
   net::KeygenHandler keygen_handler(key_size_in_bits, challenge_string, url);
 
 #if defined(USE_NSS)
   // Attach a password delegate so we can authenticate.
-  keygen_handler.set_pk11_password_delegate(
-      browser::NewPK11BlockingDialogDelegate(browser::kPK11PasswordKeygen,
-                                             url.host()));
+  keygen_handler.set_crypto_module_password_delegate(
+      browser::NewCryptoModuleBlockingDialogDelegate(
+          browser::kCryptoModulePasswordKeygen, url.host()));
 #endif  // defined(USE_NSS)
 
   ViewHostMsg_Keygen::WriteReplyParams(
       reply_msg,
       keygen_handler.GenKeyAndSignChallenge());
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(this, &RenderMessageFilter::Send, reply_msg));
 }
@@ skipping 221 matching lines @@
 }
 
 CookiesEnabledCompletion::~CookiesEnabledCompletion() {}
 
 void CookiesEnabledCompletion::RunWithParams(const Tuple1<int>& params) {
   bool result = params.a != net::ERR_ACCESS_DENIED;
   ViewHostMsg_CookiesEnabled::WriteReplyParams(reply_msg_, result);
   filter_->Send(reply_msg_);
   delete this;
 }