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

chrome/browser/dom_ui/options/certificate_manager_handler.cc

Index: chrome/browser/dom_ui/options/certificate_manager_handler.cc
diff --git a/chrome/browser/dom_ui/options/certificate_manager_handler.cc b/chrome/browser/dom_ui/options/certificate_manager_handler.cc
index ac98bf0eb52c2613f52b213b8a67eb9f22adf057..7ac2bb548d2ffed3b9ffdf1b3098333df3c3f912 100644
--- a/chrome/browser/dom_ui/options/certificate_manager_handler.cc
+++ b/chrome/browser/dom_ui/options/certificate_manager_handler.cc
@@ -18,7 +18,8 @@
 #include "chrome/browser/gtk/certificate_dialogs.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/tab_contents_view.h"
-#include "chrome/browser/ui/pk11_password_dialog.h"
+#include "chrome/browser/ui/crypto_module_password_dialog.h"
+#include "chrome/common/net/x509_certificate_model.h"

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

Just curious: why do we need to include x509_certificate_model.h?

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

It snuck in from a different change.  Removed.

 #include "grit/generated_resources.h"
 #include "net/base/crypto_module.h"
 #include "net/base/x509_certificate.h"
@@ -538,7 +539,7 @@ void CertificateManagerHandler::ExportPersonalPasswordSelected(
   // TODO(mattm): do something smarter about non-extractable keys
   browser::UnlockCertSlotIfNecessary(
       selected_cert_list_[0].get(),
-      browser::kPK11PasswordCertExport,
+      browser::kCryptoModulePasswordCertExport,
       "",  // unused.
       NewCallback(this,
                   &CertificateManagerHandler::ExportPersonalSlotsUnlocked));
@@ -631,7 +632,7 @@ void CertificateManagerHandler::ImportPersonalFileRead(
 
   browser::UnlockSlotIfNecessary(
       module_.get(),
-      browser::kPK11PasswordCertImport,
+      browser::kCryptoModulePasswordCertImport,
       "",  // unused.
       NewCallback(this,
                   &CertificateManagerHandler::ImportPersonalSlotUnlocked));