Update keygen to use correct NSS slot on ChromeOS multiprofile.

chrome/browser/chrome_content_browser_client.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 171 matching lines @@
 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
 #include "chrome/browser/captive_portal/captive_portal_tab_helper.h"
 #endif
 
 #if defined(OS_ANDROID)
 #include "ui/base/ui_base_paths.h"
 #include "ui/gfx/android/device_display_info.h"
 #endif
 
 #if defined(USE_NSS)
-#include "chrome/browser/ui/crypto_module_password_dialog.h"
+#include "chrome/browser/ui/crypto_module_delegate_nss.h"
 #endif
 
 #if !defined(OS_CHROMEOS)
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #endif
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/media_galleries/fileapi/media_file_system_backend.h"
 #endif
@@ skipping 2412 matching lines @@
                            sandbox::TargetPolicy::HANDLES_DUP_ANY,
                            L"File");
   if (result != sandbox::SBOX_ALL_OK) {
     *success = false;
     return;
   }
 }
 #endif
 
 #if defined(USE_NSS)
-crypto::CryptoModuleBlockingPasswordDelegate*
-    ChromeContentBrowserClient::GetCryptoPasswordDelegate(
+crypto::NSSCryptoModuleDelegate*
+    ChromeContentBrowserClient::GetKeygenCryptoModuleDelegate(
+        content::ResourceContext* context,
         const GURL& url) {
-  return chrome::NewCryptoModuleBlockingDialogDelegate(
-      chrome::kCryptoModulePasswordKeygen, url.host());
+  return chrome::NewNSSCryptoModuleDelegate(
+      context, chrome::kCryptoModulePasswordKeygen, url.host());
 }
 #endif
 
 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
     content::BrowserContext* browser_context,
     const GURL& url) {
 #if defined(ENABLE_PLUGINS)
   Profile* profile = Profile::FromBrowserContext(browser_context);
   const ExtensionSet* extension_set = NULL;
   if (profile) {
     extension_set = extensions::ExtensionSystem::Get(profile)->
         extension_service()->extensions();
   }
   // TODO(teravest): Populate allowed_file_handle_origins_ when FileIO is moved
   // from the renderer to the browser.
   return IsExtensionOrSharedModuleWhitelisted(url, extension_set,
                                               allowed_file_handle_origins_) ||
          IsHostAllowedByCommandLine(url, extension_set,
                                     switches::kAllowNaClFileHandleAPI);
 #else
   return false;
 #endif
 }
 
 }  // namespace chrome