| Index: components/nacl/loader/nacl_ipc_adapter.cc
|
| diff --git a/components/nacl/loader/nacl_ipc_adapter.cc b/components/nacl/loader/nacl_ipc_adapter.cc
|
| index 86d92c260785093702f908167b3a6179c6f825d9..2d01c063443d9f36e2238b85dcb4098e00b692e7 100644
|
| --- a/components/nacl/loader/nacl_ipc_adapter.cc
|
| +++ b/components/nacl/loader/nacl_ipc_adapter.cc
|
| @@ -342,17 +342,18 @@ NaClIPCAdapter::IOThreadData::IOThreadData() {
|
| NaClIPCAdapter::IOThreadData::~IOThreadData() {
|
| }
|
|
|
| -NaClIPCAdapter::NaClIPCAdapter(const IPC::ChannelHandle& handle,
|
| - base::TaskRunner* runner,
|
| - ResolveFileTokenCallback resolve_file_token_cb,
|
| - OpenResourceCallback open_resource_cb)
|
| +NaClIPCAdapter::NaClIPCAdapter(
|
| + const IPC::ChannelHandle& handle,
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& runner,
|
| + ResolveFileTokenCallback resolve_file_token_cb,
|
| + OpenResourceCallback open_resource_cb)
|
| : lock_(),
|
| cond_var_(&lock_),
|
| task_runner_(runner),
|
| resolve_file_token_cb_(resolve_file_token_cb),
|
| open_resource_cb_(open_resource_cb),
|
| locked_data_() {
|
| - io_thread_data_.channel_ = IPC::Channel::CreateServer(handle, this);
|
| + io_thread_data_.channel_ = IPC::Channel::CreateServer(handle, this, runner);
|
| // Note, we can not PostTask for ConnectChannelOnIOThread here. If we did,
|
| // and that task ran before this constructor completes, the reference count
|
| // would go to 1 and then to 0 because of the Task, before we've been returned
|
|
|