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

content/browser/renderer_host/render_message_filter.cc

Index: content/browser/renderer_host/render_message_filter.cc
diff --git a/content/browser/renderer_host/render_message_filter.cc b/content/browser/renderer_host/render_message_filter.cc
index 7fd1870b1ac15ff53ed069d7b05f2ec35e1ee05e..d50313c7739495fca1dfc17a2f0d652850bb0eba 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -22,6 +22,7 @@
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/loader/resource_dispatcher_host_impl.h"
 #include "content/browser/media/media_internals.h"
+#include "content/browser/net/keygen_handler.h"
 #include "content/browser/plugin_process_host.h"
 #include "content/browser/plugin_service_impl.h"
 #include "content/browser/ppapi_plugin_process_host.h"
@@ -55,7 +56,6 @@
 #include "media/audio/audio_parameters.h"
 #include "media/base/media_log_event.h"
 #include "net/base/io_buffer.h"
-#include "net/base/keygen_handler.h"
 #include "net/base/mime_util.h"
 #include "net/base/request_priority.h"
 #include "net/cookies/canonical_cookie.h"
@@ -933,6 +933,8 @@ void RenderMessageFilter::OnKeygen(uint32 key_size_index,
                                    const std::string& challenge_string,
                                    const GURL& url,
                                    IPC::Message* reply_msg) {
+  LOG(INFO) << "render_process_id_:" << render_process_id_
+            << " routing_id:" << reply_msg->routing_id();
   // Map displayed strings indicating level of keysecurity in the <keygen>
   // menu to the key size in bits. (See SSLKeyGeneratorChromium.cpp in WebCore.)
   int key_size_in_bits;
@@ -950,40 +952,18 @@ void RenderMessageFilter::OnKeygen(uint32 key_size_index,
       return;
   }
 
-  VLOG(1) << "Dispatching keygen task to worker pool.";
-  // Dispatch to worker pool, so we do not block the IO thread.
-  if (!base::WorkerPool::PostTask(
-           FROM_HERE,
-           base::Bind(
-               &RenderMessageFilter::OnKeygenOnWorkerThread, this,
-               key_size_in_bits, challenge_string, url, reply_msg),
-           true)) {
-    NOTREACHED() << "Failed to dispatch keygen task to worker pool";
-    ViewHostMsg_Keygen::WriteReplyParams(reply_msg, std::string());
-    Send(reply_msg);
-    return;
-  }
+  GenerateKey(
+      resource_context_,
+      key_size_in_bits,
+      challenge_string,
+      url,
+      base::Bind(&RenderMessageFilter::OnKeygenComplete, this, reply_msg));
 }
 
-void RenderMessageFilter::OnKeygenOnWorkerThread(
-    int key_size_in_bits,
-    const std::string& challenge_string,
-    const GURL& url,
-    IPC::Message* reply_msg) {
-  DCHECK(reply_msg);
-
-  // Generate a signed public key and challenge, then send it back.
-  net::KeygenHandler keygen_handler(key_size_in_bits, challenge_string, url);
-
-#if defined(USE_NSS)
-  // Attach a password delegate so we can authenticate.
-  keygen_handler.set_crypto_module_password_delegate(
-      GetContentClient()->browser()->GetCryptoPasswordDelegate(url));
-#endif  // defined(USE_NSS)
-
-  ViewHostMsg_Keygen::WriteReplyParams(
-      reply_msg,
-      keygen_handler.GenKeyAndSignChallenge());
+void RenderMessageFilter::OnKeygenComplete(
+    IPC::Message* reply_msg,
+    const std::string& result) {
+  ViewHostMsg_Keygen::WriteReplyParams(reply_msg, result);
   Send(reply_msg);
 }