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

chrome/chrome_browser.gypi

 # 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': '<(library)',
       'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
@@ skipping 1383 matching lines @@
         'browser/ui/gtk/gconf_titlebar_listener.cc',
         'browser/ui/gtk/gconf_titlebar_listener.h',
         'browser/ui/gtk/gtk_chrome_cookie_view.cc',
         'browser/ui/gtk/gtk_chrome_cookie_view.h',
         'browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc',
         'browser/ui/gtk/create_application_shortcuts_dialog_gtk.h',
         'browser/ui/gtk/custom_button.cc',
         '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',
         'browser/ui/gtk/download_item_gtk.cc',
         'browser/ui/gtk/download_item_gtk.h',
         'browser/ui/gtk/download_shelf_gtk.cc',
         'browser/ui/gtk/download_shelf_gtk.h',
         'browser/ui/gtk/download_started_animation_gtk.cc',
         'browser/ui/gtk/edit_search_engine_dialog.cc',
         'browser/ui/gtk/edit_search_engine_dialog.h',
@@ skipping 116 matching lines @@
         'browser/ui/gtk/options/passwords_page_gtk.h',
         'browser/ui/gtk/options/simple_content_exceptions_window.cc',
         'browser/ui/gtk/options/simple_content_exceptions_window.h',
         'browser/ui/gtk/options/url_picker_dialog_gtk.cc',
         'browser/ui/gtk/options/url_picker_dialog_gtk.h',
         'browser/ui/gtk/overflow_button.cc',
         'browser/ui/gtk/overflow_button.h',
         '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',
         'browser/ui/gtk/reload_button_gtk.h',
         'browser/ui/gtk/repost_form_warning_gtk.cc',
         'browser/ui/gtk/repost_form_warning_gtk.h',
         'browser/ui/gtk/rounded_window.cc',
         'browser/ui/gtk/rounded_window.h',
         'browser/ui/gtk/sad_tab_gtk.cc',
         'browser/ui/gtk/sad_tab_gtk.h',
@@ skipping 1530 matching lines @@
         'browser/ui/cocoa/window_size_autosaver.h',
         'browser/ui/cocoa/window_size_autosaver.mm',
         'browser/ui/cocoa/wrench_menu/menu_tracked_button.h',
         'browser/ui/cocoa/wrench_menu/menu_tracked_button.mm',
         'browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h',
         'browser/ui/cocoa/wrench_menu/menu_tracked_root_view.mm',
         'browser/ui/cocoa/wrench_menu/wrench_menu_button_cell.h',
         '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',
         'browser/ui/find_bar/find_bar_state.h',
         'browser/ui/find_bar/find_bar_state.cc',
         'browser/ui/find_bar/find_notification_details.h',
         'browser/ui/input_window_dialog.h',
         'browser/ui/input_window_dialog_gtk.cc',
         'browser/ui/input_window_dialog_win.cc',
         'browser/ui/login/login_model.h',
         'browser/ui/login/login_prompt.cc',
         'browser/ui/login/login_prompt.h',
         'browser/ui/login/login_prompt_gtk.cc',
         'browser/ui/login/login_prompt_mac.h',
         'browser/ui/login/login_prompt_mac.mm',
         'browser/ui/login/login_prompt_win.cc',
         'browser/ui/omnibox/location_bar.h',
         'browser/ui/omnibox/location_bar_util.cc',
         'browser/ui/omnibox/location_bar_util.h',
         'browser/ui/options/options_page_base.cc',
         'browser/ui/options/options_page_base.h',
         'browser/ui/options/options_util.cc',
         'browser/ui/options/options_util.h',
         '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',
         'browser/ui/tabs/dock_info_gtk.cc',
         'browser/ui/tabs/dock_info_mac.cc',
         'browser/ui/tabs/dock_info_win.cc',
         'browser/ui/tabs/dock_info.cc',
         'browser/ui/tabs/dock_info.h',
         'browser/ui/tabs/tab_menu_model.cc',
         'browser/ui/tabs/tab_menu_model.h',
@@ skipping 610 matching lines @@
             'browser/importer/nss_decryptor_system_nss.h',
             'browser/jankometer.cc',
             'browser/password_manager/login_database_posix.cc',
             'browser/power_save_blocker_stub.cc',
             'browser/renderer_host/backing_store_proxy.cc',
             'browser/renderer_host/backing_store_proxy.h',
             'browser/renderer_host/gpu_view_host.cc',
             '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',
           ],
           'sources': [
             # Build Apple sample code
             '../third_party/apple/ImageAndTextCell.h',
             '../third_party/apple/ImageAndTextCell.m',
             # Build the necessary GTM sources
             '../third_party/GTM/AppKit/GTMFadeTruncatingTextFieldCell.h',
             '../third_party/GTM/AppKit/GTMFadeTruncatingTextFieldCell.m',
@@ skipping 157 matching lines @@
             'browser/dom_ui/conflicts_ui.cc',
             'browser/dom_ui/conflicts_ui.h',
             'browser/history/history_indexer.idl',
           ],
           'sources!': [
             'browser/ui/browser_list_stub.cc',
             'browser/history/history_publisher_none.cc',
             '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',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
                 '<(allocator_target)',
               ],
             }],
           ],
@@ skipping 271 matching lines @@
                 ['include', '^browser/ui/gtk/certificate_dialogs.cc'],
                 ['include', '^browser/ui/gtk/certificate_dialogs.h'],
                 ['include', '^browser/ui/gtk/certificate_viewer.cc'],
                 ['include', '^browser/ui/gtk/certificate_viewer.h'],
                 ['include', '^browser/ui/gtk/chrome_gtk_frame.cc'],
                 ['include', '^browser/ui/gtk/chrome_gtk_frame.h'],
                 ['include', '^browser/ui/gtk/collected_cookies_gtk.cc'],
                 ['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'],
                 ['include', '^browser/ui/gtk/edit_search_engine_dialog.cc'],
                 ['include', '^browser/ui/gtk/edit_search_engine_dialog.h'],
                 ['include', '^browser/ui/gtk/first_run_dialog.cc'],
                 ['include', '^browser/ui/gtk/first_run_dialog.h'],
                 ['include', '^browser/ui/gtk/gtk_chrome_button.cc'],
                 ['include', '^browser/ui/gtk/gtk_chrome_button.h'],
                 ['include', '^browser/ui/gtk/gtk_chrome_link_button.cc'],
@@ skipping 16 matching lines @@
                 ['include', '^browser/ui/gtk/import_progress_dialog_gtk.h'],
                 ['include', '^browser/ui/gtk/import_lock_dialog_gtk.cc'],
                 ['include', '^browser/ui/gtk/import_lock_dialog_gtk.h'],
                 ['include', '^browser/ui/gtk/keyword_editor_view.cc'],
                 ['include', '^browser/ui/gtk/keyword_editor_view.h'],
                 ['include', '^browser/ui/gtk/nine_box.cc'],
                 ['include', '^browser/ui/gtk/nine_box.h'],
                 ['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'],
                 ['include', '^browser/ui/gtk/ssl_client_certificate_selector.cc'],
                 ['include', '^browser/ui/gtk/tab_contents_drag_source.cc'],
                 ['include', '^browser/ui/gtk/tab_contents_drag_source.h'],
                 ['include', '^browser/ui/gtk/task_manager_gtk.cc'],
                 ['include', '^browser/ui/gtk/task_manager_gtk.h'],
                 ['include', '^browser/ui/gtk/view_id_util.cc'],
                 ['include', '^browser/ui/gtk/view_id_util.h'],
@@ skipping 139 matching lines @@
             'browser/history_view.cc',
             'browser/ime_input.cc',
             'browser/importer/ie_importer.cc',
           ],
         }],
         [ 'use_openssl==1', {
           'sources!': [
             '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',
           ]},
         ],
       ],
     },
     {
       # Protobuf compiler / generate rule for feedback
       'target_name': 'userfeedback_proto',
       'type': 'none',
       'sources': [
         'browser/userfeedback/proto/annotations.proto',
@@ skipping 136 matching lines @@
       ],
     },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: