*WIP* Store NSS slots per profile. Move keygen to chrome.

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 035335d10704222de850a784c6d654da3b474c99..9d949b548bc3602130606a456f66dd4ca3688551 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -53,6 +53,7 @@
 #include "chrome/browser/nacl_host/nacl_host_message_filter.h"
 #include "chrome/browser/nacl_host/nacl_process_host.h"
 #include "chrome/browser/net/chrome_net_log.h"
+#include "chrome/browser/net/keygen_handler.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/desktop_notification_service_factory.h"
 #include "chrome/browser/platform_util.h"
@@ -138,6 +139,7 @@
 #include "net/base/mime_util.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_options.h"
+#include "net/ssl/client_cert_store_impl.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ppapi/host/ppapi_host.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -159,6 +161,7 @@
 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/net/client_cert_store_cros.h"
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 #include "chromeos/chromeos_switches.h"
 #elif defined(OS_LINUX)
@@ -1763,6 +1766,18 @@ void ChromeContentBrowserClient::AllowCertificateError(
                       strict_enforcement, callback);
 }
 
+scoped_ptr<net::ClientCertStore> ChromeContentBrowserClient::GetClientCertStore(
+    content::ResourceContext* context) {
+#if defined(OS_CHROMEOS)
+  return scoped_ptr<net::ClientCertStore>(
+      new chromeos::ClientCertStoreCros(context));
+#elif !defined(USE_OPENSSL)
+  return scoped_ptr<net::ClientCertStore>(new net::ClientCertStoreImpl());
+#else
+  return scoped_ptr<net::ClientCertStore>();
+#endif
+}
+
 void ChromeContentBrowserClient::SelectClientCertificate(
     int render_process_id,
     int render_view_id,
@@ -1831,6 +1846,16 @@ void ChromeContentBrowserClient::AddCertificate(
       render_process_id, render_view_id);
 }
 
+void ChromeContentBrowserClient::GenerateKey(
+    content::ResourceContext* context,
+    int key_size_in_bits,
+    const std::string& challenge,
+    const GURL& url,
+    const base::Callback<void(const std::string*)>& callback) {
+  chrome_browser_net::GenerateKey(
+      context, key_size_in_bits, challenge, url, true, callback);
+}
+
 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() {
   return MediaCaptureDevicesDispatcher::GetInstance();
 }
@@ -2585,15 +2610,6 @@ void ChromeContentBrowserClient::PreSpawnRenderer(
 }
 #endif
 
-#if defined(USE_NSS)
-crypto::CryptoModuleBlockingPasswordDelegate*
-    ChromeContentBrowserClient::GetCryptoPasswordDelegate(
-        const GURL& url) {
-  return chrome::NewCryptoModuleBlockingDialogDelegate(
-      chrome::kCryptoModulePasswordKeygen, url.host());
-}
-#endif
-
 bool ChromeContentBrowserClient::IsPluginAllowedToCallRequestOSFileHandle(
     content::BrowserContext* browser_context,
     const GURL& url) {