Index: chrome/browser/nacl_host/nacl_process_host.cc |
=================================================================== |
--- chrome/browser/nacl_host/nacl_process_host.cc (revision 69057) |
+++ chrome/browser/nacl_host/nacl_process_host.cc (working copy) |
@@ -13,7 +13,7 @@ |
#include "base/command_line.h" |
#include "base/metrics/nacl_histogram.h" |
#include "base/utf_string_conversions.h" |
-#include "chrome/browser/renderer_host/resource_message_filter.h" |
+#include "chrome/browser/renderer_host/render_message_filter.h" |
#include "chrome/common/chrome_switches.h" |
#include "chrome/common/logging_chrome.h" |
#include "chrome/common/nacl_cmd_line.h" |
@@ -74,10 +74,10 @@ |
// OnProcessLaunched didn't get called because the process couldn't launch. |
// Don't keep the renderer hanging. |
reply_msg_->set_reply_error(); |
- resource_message_filter_->Send(reply_msg_); |
+ render_message_filter_->Send(reply_msg_); |
} |
-bool NaClProcessHost::Launch(ResourceMessageFilter* resource_message_filter, |
+bool NaClProcessHost::Launch(RenderMessageFilter* render_message_filter, |
int socket_count, |
IPC::Message* reply_msg) { |
#ifdef DISABLE_NACL |
@@ -116,7 +116,7 @@ |
return false; |
} |
UmaNaclHistogramEnumeration(NACL_STARTED); |
- resource_message_filter_ = resource_message_filter; |
+ render_message_filter_ = render_message_filter; |
reply_msg_ = reply_msg; |
return true; |
@@ -186,7 +186,7 @@ |
HANDLE handle_in_renderer; |
DuplicateHandle(base::GetCurrentProcessHandle(), |
reinterpret_cast<HANDLE>(sockets_for_renderer_[i]), |
- resource_message_filter_->handle(), |
+ render_message_filter_->handle(), |
&handle_in_renderer, |
GENERIC_READ | GENERIC_WRITE, |
FALSE, |
@@ -207,7 +207,7 @@ |
// Copy the process handle into the renderer process. |
DuplicateHandle(base::GetCurrentProcessHandle(), |
handle(), |
- resource_message_filter_->handle(), |
+ render_message_filter_->handle(), |
&nacl_process_handle, |
PROCESS_DUP_HANDLE, |
FALSE, |
@@ -222,8 +222,8 @@ |
ViewHostMsg_LaunchNaCl::WriteReplyParams( |
reply_msg_, handles_for_renderer, nacl_process_handle, nacl_process_id); |
- resource_message_filter_->Send(reply_msg_); |
- resource_message_filter_ = NULL; |
+ render_message_filter_->Send(reply_msg_); |
+ render_message_filter_ = NULL; |
reply_msg_ = NULL; |
sockets_for_renderer_.clear(); |