Update keygen to use correct NSS slot on ChromeOS multiprofile.

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 3aca534e48ef8993f4383e116a243508e0c8eb23..229be4b54f1254afa2a532209a9fd433e1cd6890 100644
--- a/content/browser/renderer_host/render_message_filter.cc
+++ b/content/browser/renderer_host/render_message_filter.cc
@@ -964,13 +964,37 @@ void RenderMessageFilter::OnKeygen(uint32 key_size_index,
       return;
   }
 
+  // Create the KeygenHandler on the IO thread so that we can safely use
+  // ResourceContext to initialize the crypto module delegate (when using NSS).
+  scoped_ptr<net::KeygenHandler> keygen_handler(
+      new net::KeygenHandler(key_size_in_bits, challenge_string, url));
+#if defined(USE_NSS)
+  net::KeygenHandler* keygen_handler_ptr = keygen_handler.get();
+  // Attach a delegate to handle choosing what token to store the generated key
+  // in and authenticating to the token.
+  keygen_handler_ptr->InitializeCryptoModuleDelegate(
+      GetContentClient()->browser()->GetKeygenCryptoModuleDelegate(
+          resource_context_, url),
+      base::Bind(&RenderMessageFilter::PostKeygenToWorkerThread,
+                 this,
+                 base::Passed(&keygen_handler),
+                 reply_msg));
+#else
+  PostKeygenToWorkerThread(keygen_handler.Pass(), reply_msg);
+#endif  // defined(USE_NSS)
+}
+
+void RenderMessageFilter::PostKeygenToWorkerThread(
+    scoped_ptr<net::KeygenHandler> keygen_handler,
+    IPC::Message* reply_msg) {
   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),
+           base::Bind(&RenderMessageFilter::OnKeygenOnWorkerThread,
+                      this,
+                      base::Passed(&keygen_handler),
+                      reply_msg),
            true)) {
     NOTREACHED() << "Failed to dispatch keygen task to worker pool";
     ViewHostMsg_Keygen::WriteReplyParams(reply_msg, std::string());
@@ -980,24 +1004,14 @@ void RenderMessageFilter::OnKeygen(uint32 key_size_index,
 }
 
 void RenderMessageFilter::OnKeygenOnWorkerThread(
-    int key_size_in_bits,
-    const std::string& challenge_string,
-    const GURL& url,
+    scoped_ptr<net::KeygenHandler> keygen_handler,
     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());
+      keygen_handler->GenKeyAndSignChallenge());
   Send(reply_msg);
 }