Index: chrome/browser/ppapi_plugin_process_host.cc |
=================================================================== |
--- chrome/browser/ppapi_plugin_process_host.cc (revision 69229) |
+++ chrome/browser/ppapi_plugin_process_host.cc (working copy) |
@@ -10,7 +10,6 @@ |
#include "chrome/browser/renderer_host/render_message_filter.h" |
#include "chrome/common/chrome_switches.h" |
#include "chrome/common/render_messages.h" |
-#include "ipc/ipc_channel_handle.h" |
#include "ipc/ipc_switches.h" |
#include "ppapi/proxy/ppapi_messages.h" |
@@ -66,12 +65,6 @@ |
void PpapiPluginProcessHost::OnProcessLaunched() { |
} |
-URLRequestContext* PpapiPluginProcessHost::GetRequestContext( |
- uint32 request_id, |
- const ViewHostMsg_Resource_Request& request_data) { |
- return NULL; |
-} |
- |
void PpapiPluginProcessHost::OnMessageReceived(const IPC::Message& msg) { |
IPC_BEGIN_MESSAGE_MAP(PpapiPluginProcessHost, msg) |
IPC_MESSAGE_HANDLER(PpapiHostMsg_PluginLoaded, OnPluginLoaded) |
@@ -82,16 +75,15 @@ |
void PpapiPluginProcessHost::OnChannelConnected(int32 peer_pid) { |
#if defined(OS_WIN) |
base::ProcessHandle plugins_renderer_handle = NULL; |
- ::DuplicateHandle(::GetCurrentProcess(), filter_->handle(), |
+ ::DuplicateHandle(::GetCurrentProcess(), filter_->peer_handle(), |
GetChildProcessHandle(), &plugins_renderer_handle, |
0, FALSE, DUPLICATE_SAME_ACCESS); |
#elif defined(OS_POSIX) |
- base::ProcessHandle plugins_renderer_handle = filter_->handle(); |
+ base::ProcessHandle plugins_renderer_handle = filter_->peer_handle(); |
#endif |
- PpapiMsg_LoadPlugin* msg = new PpapiMsg_LoadPlugin(plugins_renderer_handle, |
- plugin_path_, |
- filter_->id()); |
+ PpapiMsg_LoadPlugin* msg = new PpapiMsg_LoadPlugin( |
+ plugins_renderer_handle, plugin_path_, filter_->render_process_id()); |
if (!Send(msg)) // Just send an empty handle on failure. |
ReplyToRenderer(NULL, IPC::ChannelHandle()); |
// This function will result in OnChannelCreated getting called to finish. |
@@ -108,7 +100,7 @@ |
#if defined(OS_WIN) |
base::ProcessHandle renderers_plugin_handle = NULL; |
::DuplicateHandle(::GetCurrentProcess(), plugin_process, |
- filter_->handle(), &renderers_plugin_handle, |
+ filter_->peer_handle(), &renderers_plugin_handle, |
0, FALSE, DUPLICATE_SAME_ACCESS); |
#elif defined(OS_POSIX) |
// Don't need to duplicate anything on POSIX since it's just a PID. |