| Index: ppapi/proxy/ppapi_proxy_test.cc
|
| diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc
|
| index 14362d964afca40a9e03516f075fc274edbad5bd..fdd16043515d1bf506a78238cb84746146e22bb9 100644
|
| --- a/ppapi/proxy/ppapi_proxy_test.cc
|
| +++ b/ppapi/proxy/ppapi_proxy_test.cc
|
| @@ -163,7 +163,7 @@ Dispatcher* PluginProxyTestHarness::GetDispatcher() {
|
|
|
| void PluginProxyTestHarness::SetUpHarness() {
|
| // These must be first since the dispatcher set-up uses them.
|
| - CreatePluginGlobals();
|
| + CreatePluginGlobals(nullptr /* ipc_task_runner */);
|
| // Some of the methods called during set-up check that the lock is held.
|
| ProxyAutoLock lock;
|
|
|
| @@ -190,7 +190,8 @@ void PluginProxyTestHarness::SetUpHarnessWithChannel(
|
| base::WaitableEvent* shutdown_event,
|
| bool is_client) {
|
| // These must be first since the dispatcher set-up uses them.
|
| - CreatePluginGlobals();
|
| + scoped_refptr<base::TaskRunner> ipc_task_runner(ipc_message_loop);
|
| + CreatePluginGlobals(ipc_message_loop);
|
| // Some of the methods called during set-up check that the lock is held.
|
| ProxyAutoLock lock;
|
|
|
| @@ -223,12 +224,14 @@ void PluginProxyTestHarness::TearDownHarness() {
|
| plugin_globals_.reset();
|
| }
|
|
|
| -void PluginProxyTestHarness::CreatePluginGlobals() {
|
| +void PluginProxyTestHarness::CreatePluginGlobals(
|
| + const scoped_refptr<base::TaskRunner>& ipc_task_runner) {
|
| if (globals_config_ == PER_THREAD_GLOBALS) {
|
| - plugin_globals_.reset(new PluginGlobals(PpapiGlobals::PerThreadForTest()));
|
| + plugin_globals_.reset(new PluginGlobals(PpapiGlobals::PerThreadForTest(),
|
| + ipc_task_runner));
|
| PpapiGlobals::SetPpapiGlobalsOnThreadForTest(GetGlobals());
|
| } else {
|
| - plugin_globals_.reset(new PluginGlobals());
|
| + plugin_globals_.reset(new PluginGlobals(ipc_task_runner));
|
| }
|
| }
|
|
|
|
|