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 c65ba623e3ba89a30bd36586db2d78c6beb5d0aa..87b315e1ff6d07d7de411c1078274a5735d8a799 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1526,7 +1526,7 @@
         'browser/gtk/owned_widget_gtk.cc',
         'browser/gtk/owned_widget_gtk.h',
         'browser/gtk/page_info_bubble_gtk.cc',
-        'browser/gtk/pk11_password_dialog.cc',
+        'browser/gtk/crypto_module_password_dialog.cc',
         'browser/gtk/process_singleton_dialog.cc',
         'browser/gtk/process_singleton_dialog.h',
         'browser/gtk/reload_button_gtk.cc',
@@ -3094,8 +3094,8 @@
         '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/crypto_module_password_dialog.h',
+        'browser/ui/crypto_module_password_dialog_nss.cc',
         'browser/ui/status_bubble.h',
         'browser/ui/tab_contents/tab_contents_wrapper.cc',
         'browser/ui/tab_contents/tab_contents_wrapper.h',
@@ -3720,7 +3720,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',
           ],
@@ -3898,7 +3898,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',
           ],
@@ -4222,8 +4222,7 @@
                 ['include', '^browser/gtk/options/'],
                 ['include', '^browser/gtk/owned_widget_gtk.cc'],
                 ['include', '^browser/gtk/owned_widget_gtk.h'],
-                ['include', '^browser/gtk/pk11_password_dialog.cc'],
-                ['include', '^browser/gtk/pk11_password_dialog.h'],
+                ['include', '^browser/gtk/crypto_module_password_dialog.cc'],
                 ['include', '^browser/gtk/popup_blocked_animation_gtk.cc'],
                 ['include', '^browser/gtk/repost_form_warning_gtk.cc'],
                 ['include', '^browser/gtk/repost_form_warning_gtk.h'],
@@ -4381,7 +4380,7 @@
             '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',
           ],
         }],
       ],