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

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 7ec639476ce69ce412f6ec68939c1e5f49bddb6a..1c6e03728a05b92e000463ad0b8a4a355fb09cc4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1401,6 +1401,7 @@
         'browser/ui/gtk/custom_button.h',
         'browser/ui/gtk/custom_drag.cc',
         'browser/ui/gtk/custom_drag.h',
+        'browser/ui/gtk/crypto_module_password_dialog.cc',
         'browser/ui/gtk/dialogs_gtk.cc',
         'browser/ui/gtk/download_in_progress_dialog_gtk.cc',
         'browser/ui/gtk/download_in_progress_dialog_gtk.h',
@@ -1537,7 +1538,6 @@
         'browser/ui/gtk/owned_widget_gtk.cc',
         'browser/ui/gtk/owned_widget_gtk.h',
         'browser/ui/gtk/page_info_bubble_gtk.cc',
-        'browser/ui/gtk/pk11_password_dialog.cc',
         'browser/ui/gtk/process_singleton_dialog.cc',
         'browser/ui/gtk/process_singleton_dialog.h',
         'browser/ui/gtk/reload_button_gtk.cc',
@@ -3088,6 +3088,9 @@
         'browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.mm',
         'browser/ui/cocoa/wrench_menu/wrench_menu_controller.h',
         'browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm',
+        'browser/ui/crypto_module_password_dialog.h',
+        'browser/ui/crypto_module_password_dialog_nss.cc',
+        'browser/ui/crypto_module_password_dialog_openssl.cc',
         'browser/ui/find_bar/find_bar.h',
         'browser/ui/find_bar/find_bar_controller.cc',
         'browser/ui/find_bar/find_bar_controller.h',
@@ -3114,9 +3117,6 @@
         'browser/ui/options/options_window.h',
         'browser/ui/options/show_options_url.cc',
         'browser/ui/options/show_options_url.h',
-        'browser/ui/pk11_password_dialog.h',
-        'browser/ui/pk11_password_dialog_nss.cc',
-        'browser/ui/pk11_password_dialog_openssl.cc',
         'browser/ui/status_bubble.h',
         'browser/ui/tab_contents/tab_contents_wrapper.cc',
         'browser/ui/tab_contents/tab_contents_wrapper.h',
@@ -3747,7 +3747,7 @@
             'browser/renderer_host/gpu_view_host.h',
             'browser/renderer_host/video_layer_proxy.cc',
             'browser/renderer_host/video_layer_proxy.h',
-            'browser/ui/pk11_password_dialog_nss.cc',
+            'browser/ui/crypto_module_password_dialog_nss.cc',
             'browser/ui/views/extensions/extension_view.cc',
             'browser/ui/views/extensions/extension_view.h',
           ],
@@ -3925,7 +3925,7 @@
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
             'browser/power_save_blocker_stub.cc',
-            'browser/ui/pk11_password_dialog_nss.cc',
+            'browser/ui/crypto_module_password_dialog_nss.cc',
             'browser/ui/views/keyboard_overlay_delegate.cc',
             'browser/ui/views/select_file_dialog.cc',
           ],
@@ -4217,6 +4217,7 @@
                 ['include', '^browser/ui/gtk/collected_cookies_gtk.h'],
                 ['include', '^browser/ui/gtk/constrained_window_gtk.cc'],
                 ['include', '^browser/ui/gtk/constrained_window_gtk.h'],
+                ['include', '^browser/ui/gtk/crypto_module_password_dialog.cc'],
                 ['include', '^browser/ui/gtk/gtk_chrome_cookie_view.cc'],
                 ['include', '^browser/ui/gtk/gtk_chrome_cookie_view.h'],
                 ['include', '^browser/ui/gtk/download_started_animation_gtk.cc'],
@@ -4253,7 +4254,6 @@
                 ['include', '^browser/ui/gtk/options/'],
                 ['include', '^browser/ui/gtk/owned_widget_gtk.cc'],
                 ['include', '^browser/ui/gtk/owned_widget_gtk.h'],
-                ['include', '^browser/ui/gtk/pk11_password_dialog.cc'],
                 ['include', '^browser/ui/gtk/popup_blocked_animation_gtk.cc'],
                 ['include', '^browser/ui/gtk/repost_form_warning_gtk.cc'],
                 ['include', '^browser/ui/gtk/repost_form_warning_gtk.h'],
@@ -4413,10 +4413,10 @@
             'browser/importer/nss_decryptor.cc',
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
-            'browser/ui/pk11_password_dialog_nss.cc',
+            'browser/ui/crypto_module_password_dialog_nss.cc',
           ]}, {
            'sources!': [
-             'browser/ui/pk11_password_dialog_openssl.cc',
+             'browser/ui/crypto_module_password_dialog_openssl.cc',
           ]},
         ],
       ],