Index: ppapi/proxy/ppapi_proxy_test.cc |
=================================================================== |
--- ppapi/proxy/ppapi_proxy_test.cc (revision 136613) |
+++ ppapi/proxy/ppapi_proxy_test.cc (working copy) |
@@ -157,7 +157,6 @@ |
resource_tracker().DidCreateInstance(pp_instance()); |
plugin_dispatcher_.reset(new PluginDispatcher( |
- base::Process::Current().handle(), |
&MockGetInterface, |
false)); |
plugin_dispatcher_->InitWithTestSink(&sink()); |
@@ -175,7 +174,6 @@ |
plugin_delegate_mock_.Init(ipc_message_loop, shutdown_event); |
plugin_dispatcher_.reset(new PluginDispatcher( |
- base::Process::Current().handle(), |
&MockGetInterface, |
false)); |
plugin_dispatcher_->InitPluginWithChannel(&plugin_delegate_mock_, |
@@ -201,6 +199,16 @@ |
return shutdown_event_; |
} |
+IPC::PlatformFileForTransit |
+PluginProxyTestHarness::PluginDelegateMock::ShareHandleWithRemote( |
+ base::PlatformFile handle, |
+ const IPC::SyncChannel& /* channel */, |
+ bool should_close_source) { |
+ return IPC::GetFileHandleForProcess(handle, |
+ base::Process::Current().handle(), |
+ should_close_source); |
+} |
+ |
std::set<PP_Instance>* |
PluginProxyTestHarness::PluginDelegateMock::GetGloballySeenInstanceIDSet() { |
return &instance_id_set_; |
@@ -266,7 +274,6 @@ |
// These must be first since the dispatcher set-up uses them. |
PpapiGlobals::SetPpapiGlobalsOnThreadForTest(GetGlobals()); |
host_dispatcher_.reset(new HostDispatcher( |
- base::Process::Current().handle(), |
pp_module(), |
&MockGetInterface, |
status_receiver_.get())); |
@@ -284,7 +291,6 @@ |
delegate_mock_.Init(ipc_message_loop, shutdown_event); |
host_dispatcher_.reset(new HostDispatcher( |
- base::Process::Current().handle(), |
pp_module(), |
&MockGetInterface, |
status_receiver_.get())); |
@@ -308,7 +314,17 @@ |
return shutdown_event_; |
} |
+IPC::PlatformFileForTransit |
+HostProxyTestHarness::DelegateMock::ShareHandleWithRemote( |
+ base::PlatformFile handle, |
+ const IPC::SyncChannel& /* channel */, |
+ bool should_close_source) { |
+ return IPC::GetFileHandleForProcess(handle, |
+ base::Process::Current().handle(), |
+ should_close_source); |
+} |
+ |
// HostProxyTest --------------------------------------------------------------- |
HostProxyTest::HostProxyTest() { |