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 4e87e46275dbb5c7c04bd4044d7048b1990c89e5..7a1dfea736226d00116a062f1d3e349b1414c1c5 100644 |
--- a/content/browser/renderer_host/render_message_filter.cc |
+++ b/content/browser/renderer_host/render_message_filter.cc |
@@ -61,7 +61,6 @@ |
#include "media/base/media_log_event.h" |
#include "mojo/public/cpp/system/platform_handle.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/http/http_cache.h" |
@@ -181,7 +180,6 @@ bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message) { |
IPC_MESSAGE_HANDLER(ChildProcessHostMsg_SetThreadPriority, |
OnSetThreadPriority) |
#endif |
- IPC_MESSAGE_HANDLER_DELAY_REPLY(RenderProcessHostMsg_Keygen, OnKeygen) |
IPC_MESSAGE_HANDLER(RenderProcessHostMsg_DidGenerateCacheableMetadata, |
OnCacheableMetadataAvailable) |
IPC_MESSAGE_HANDLER( |
@@ -405,76 +403,6 @@ void RenderMessageFilter::OnCacheStorageOpenCallback( |
url, expected_response_time, buf, buf_len); |
} |
-void RenderMessageFilter::OnKeygen(uint32_t key_size_index, |
- const std::string& challenge_string, |
- const GURL& url, |
- const GURL& top_origin, |
- IPC::Message* reply_msg) { |
- if (!resource_context_) |
- return; |
- |
- // 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; |
- switch (key_size_index) { |
- case 0: |
- key_size_in_bits = 2048; |
- break; |
- case 1: |
- key_size_in_bits = 1024; |
- break; |
- default: |
- DCHECK(false) << "Illegal key_size_index " << key_size_index; |
- RenderProcessHostMsg_Keygen::WriteReplyParams(reply_msg, std::string()); |
- Send(reply_msg); |
- return; |
- } |
- |
- if (!GetContentClient()->browser()->AllowKeygen(top_origin, |
- resource_context_)) { |
- RenderProcessHostMsg_Keygen::WriteReplyParams(reply_msg, std::string()); |
- Send(reply_msg); |
- return; |
- } |
- |
- resource_context_->CreateKeygenHandler( |
- key_size_in_bits, |
- challenge_string, |
- url, |
- base::Bind( |
- &RenderMessageFilter::PostKeygenToWorkerThread, this, reply_msg)); |
-} |
- |
-void RenderMessageFilter::PostKeygenToWorkerThread( |
- IPC::Message* reply_msg, |
- std::unique_ptr<net::KeygenHandler> keygen_handler) { |
- 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, |
- base::Passed(&keygen_handler), |
- reply_msg), |
- true)) { |
- NOTREACHED() << "Failed to dispatch keygen task to worker pool"; |
- RenderProcessHostMsg_Keygen::WriteReplyParams(reply_msg, std::string()); |
- Send(reply_msg); |
- } |
-} |
- |
-void RenderMessageFilter::OnKeygenOnWorkerThread( |
- std::unique_ptr<net::KeygenHandler> keygen_handler, |
- IPC::Message* reply_msg) { |
- DCHECK(reply_msg); |
- |
- // Generate a signed public key and challenge, then send it back. |
- RenderProcessHostMsg_Keygen::WriteReplyParams( |
- reply_msg, |
- keygen_handler->GenKeyAndSignChallenge()); |
- Send(reply_msg); |
-} |
- |
void RenderMessageFilter::OnMediaLogEvents( |
const std::vector<media::MediaLogEvent>& events) { |
// OnMediaLogEvents() is always dispatched to the UI thread for handling. |