Update keygen to use correct NSS slot on ChromeOS multiprofile.

chrome/chrome_browser_ui.gypi

Index: chrome/chrome_browser_ui.gypi
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 7fceeec357aff075bd2e8d57f73f76ff9f2dbe11..e7debc822905ec4cf02abc870a3113a2d75f9779 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -1085,10 +1085,11 @@
         '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',
@@ -2942,6 +2943,10 @@
           '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', {
@@ -3144,8 +3149,6 @@
           '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',
@@ -3220,8 +3223,6 @@
           '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',
@@ -3286,14 +3287,6 @@
             }],
           ],
         }],
-        [ '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/': [