Update keygen to use correct NSS slot on ChromeOS multiprofile.

chrome/chrome_browser_ui.gypi

 # Copyright 2012 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_ui',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 1067 matching lines @@
         'browser/ui/confirm_bubble_model.h',
         'browser/ui/content_settings/content_setting_bubble_model.cc',
         'browser/ui/content_settings/content_setting_bubble_model.h',
         'browser/ui/content_settings/content_setting_bubble_model_delegate.h',
         'browser/ui/content_settings/content_setting_image_model.cc',
         'browser/ui/content_settings/content_setting_image_model.h',
         'browser/ui/content_settings/content_setting_media_menu_model.cc',
         'browser/ui/content_settings/content_setting_media_menu_model.h',
         'browser/ui/content_settings/media_setting_changed_infobar_delegate.cc',
         'browser/ui/content_settings/media_setting_changed_infobar_delegate.h',
-        'browser/ui/crypto_module_password_dialog.cc',
+        'browser/ui/crypto_module_delegate_nss.cc',
+        'browser/ui/crypto_module_delegate_nss.h',
         '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/crypto_module_password_dialog_nss.h',
         'browser/ui/extensions/application_launch.cc',
         'browser/ui/extensions/application_launch.h',
         'browser/ui/extensions/extension_installed_bubble.cc',
         'browser/ui/extensions/extension_installed_bubble.h',
         'browser/ui/extensions/extension_install_ui_default.cc',
         'browser/ui/extensions/extension_install_ui_default.h',
         'browser/ui/extensions/extension_enable_flow.cc',
         'browser/ui/extensions/extension_enable_flow.h',
         'browser/ui/extensions/extension_enable_flow_delegate.h',
         'browser/ui/external_protocol_dialog_delegate.cc',
@@ skipping 1831 matching lines @@
         }],
         ['os_posix == 1 and OS != "mac" and OS != "ios" and OS != "android"', {
           'link_settings': {
             'libraries': [
               '-lXss',
             ],
           },
         }],
         ['use_nss!=1', {
           'sources!': [
             'browser/ui/webui/options/certificate_manager_handler.cc',

[Ryan Sleevi, 2013/12/05 00:23:19]

nit: In a future CL, we should add _nss suffix to these two files, so it's clear
they're NSS only.

[mattm, 2013/12/05 04:41:25]

yeah, will do.

             'browser/ui/webui/options/certificate_manager_handler.h',
+            'browser/ui/crypto_module_delegate_nss.cc',
+            'browser/ui/crypto_module_delegate_nss.h',
+            'browser/ui/crypto_module_password_dialog_nss.cc',
+            'browser/ui/crypto_module_password_dialog_nss.h',
           ],
         }],
         ['use_nss==0 and use_openssl==0', {
           'sources!': [
             'browser/ui/webui/certificate_viewer_webui.cc',
             'browser/ui/webui/certificate_viewer_webui.h',
             'browser/ui/webui/certificate_viewer_ui.cc',
             'browser/ui/webui/certificate_viewer_ui.h',
           ],
         }],
@@ skipping 182 matching lines @@
             ['exclude', '^browser/ui/webui/suggestions_internals'],
             ['exclude', '^browser/ui/webui/sync_file_system_internals'],
             ['exclude', '^browser/ui/webui/sync_promo'],
             ['exclude', '^browser/ui/webui/uber'],
           ],
         }],
         ['OS=="mac"', {
           'sources!': [
             'browser/ui/certificate_dialogs.cc',
             'browser/ui/certificate_dialogs.h',
-            'browser/ui/crypto_module_password_dialog.cc',
-            'browser/ui/crypto_module_password_dialog_nss.cc',
             'browser/ui/screen_capture_notification_ui_stub.cc',
             'browser/ui/tabs/dock_info.cc',
             'browser/ui/tabs/tab_resources.cc',
             'browser/ui/views/extensions/extension_view_views.cc',
             'browser/ui/views/extensions/extension_view_views.h',
             'browser/ui/webui/help/version_updater_basic.cc',
             'browser/ui/webui/help/version_updater_basic.h',
           ],
           'dependencies': [
             '../ui/ui.gyp:ui_cocoa_third_party_toolkits',
@@ skipping 54 matching lines @@
           ],
           'sources': [
             'browser/ui/views/network_profile_bubble_view.cc',
             'browser/ui/views/network_profile_bubble_view.h',
             'browser/ui/webui/conflicts_ui.cc',
             'browser/ui/webui/conflicts_ui.h',
           ],
           'sources!': [
             'browser/ui/certificate_dialogs.cc',
             'browser/ui/certificate_dialogs.h',
-            'browser/ui/crypto_module_password_dialog.cc',
-            'browser/ui/crypto_module_password_dialog_nss.cc',
             'browser/ui/screen_capture_notification_ui_stub.cc',
             'browser/ui/startup/autolaunch_prompt.cc',
             'browser/ui/views/frame/taskbar_decorator.cc',
             'browser/ui/views/simple_message_box_views.cc',
             'browser/ui/webui/help/version_updater_basic.cc',
             'browser/ui/webui/help/version_updater_basic.h',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
@@ skipping 44 matching lines @@
             }],
             # GTK build only
             ['toolkit_uses_gtk==1', {
               'sources/': [
                 ['exclude', '^browser/ui/toolbar/bookmark_sub_menu_model.cc'],
                 ['exclude', '^browser/ui/views/notifications/balloon_collection_views.cc'],
               ],
             }],
           ],
         }],
-        [ 'use_openssl==1', {
-          'sources!': [
-            'browser/ui/crypto_module_password_dialog_nss.cc',
-          ]}, {
-           'sources!': [
-             'browser/ui/crypto_module_password_dialog_openssl.cc',
-          ]},
-        ],
         # File manager extension replaces the native OS file open/save dialog.
         ['file_manager_extension==1', {
           'sources/': [
             ['include', '^browser/ui/views/select_file_dialog_extension.cc'],
             ['include', '^browser/ui/views/select_file_dialog_extension.h'],
             ['include', '^browser/ui/views/select_file_dialog_extension_factory.cc'],
             ['include', '^browser/ui/views/select_file_dialog_extension_factory.h'],
           ]}, {
           'sources/': [
             ['exclude', '^browser/ui/views/select_file_dialog_extension.cc'],
@@ skipping 45 matching lines @@
             'browser/ui/webui/local_discovery/local_discovery_ui.cc',
             'browser/ui/webui/local_discovery/local_discovery_ui.h',
             'browser/ui/webui/local_discovery/local_discovery_ui_handler.cc',
             'browser/ui/webui/local_discovery/local_discovery_ui_handler.h',
           ],
         }],
       ],
     },
   ],
 }