diff options
author | jamesr <jamesr@chromium.org> | 2014-11-13 15:36:42 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-13 23:37:35 +0000 |
commit | 184f354ddeff66784515ddbbee9c46355cadab6a (patch) | |
tree | b19c2b86b9d05c08e640d0a79cb38d427b204eae /mojo/edk/embedder/channel_init.cc | |
parent | 4da4d40742403e9a9cad302473f4dce1745a149f (diff) | |
download | chromium_src-184f354ddeff66784515ddbbee9c46355cadab6a.zip chromium_src-184f354ddeff66784515ddbbee9c46355cadab6a.tar.gz chromium_src-184f354ddeff66784515ddbbee9c46355cadab6a.tar.bz2 |
Update mojo sdk to rev afb4440fd5a10cba980878c326180b7ad7960480
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/728553002
Cr-Commit-Position: refs/heads/master@{#304114}
Diffstat (limited to 'mojo/edk/embedder/channel_init.cc')
-rw-r--r-- | mojo/edk/embedder/channel_init.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mojo/edk/embedder/channel_init.cc b/mojo/edk/embedder/channel_init.cc index 9ea984b..0e7a7b6 100644 --- a/mojo/edk/embedder/channel_init.cc +++ b/mojo/edk/embedder/channel_init.cc @@ -25,12 +25,11 @@ ScopedMessagePipeHandle ChannelInit::Init( DCHECK(!io_thread_task_runner_.get()); // Should only init once. io_thread_task_runner_ = io_thread_task_runner; ScopedMessagePipeHandle message_pipe = - CreateChannel(ScopedPlatformHandle(PlatformHandle(file)), - io_thread_task_runner, - base::Bind(&ChannelInit::OnCreatedChannel, - weak_factory_.GetWeakPtr(), - io_thread_task_runner), - base::MessageLoop::current()->message_loop_proxy()).Pass(); + CreateChannel( + ScopedPlatformHandle(PlatformHandle(file)), io_thread_task_runner, + base::Bind(&ChannelInit::OnCreatedChannel, weak_factory_.GetWeakPtr(), + io_thread_task_runner), + base::MessageLoop::current()->message_loop_proxy()).Pass(); return message_pipe.Pass(); } |