Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1079)

Unified Diff: components/nacl/loader/nacl_ipc_adapter.cc

Issue 2301103003: Use ChannelMojo for NaCl PPAPI channels. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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

Powered by Google App Engine
This is Rietveld 408576698