From 671db43a735bd2297225b9d74129402e66fdc549 Mon Sep 17 00:00:00 2001 From: thakis Date: Fri, 14 Nov 2014 16:04:25 -0800 Subject: Revert of Update mojo sdk to rev afb4440fd5a10cba980878c326180b7ad7960480 (patchset #3 id:40001 of https://codereview.chromium.org/728553002/) Reason for revert: Breaks incremental builds, crbug.com/433524 Original issue's description: > Update mojo sdk to rev afb4440fd5a10cba980878c326180b7ad7960480 > > TBR=jam@chromium.org > > Committed: https://crrev.com/184f354ddeff66784515ddbbee9c46355cadab6a > Cr-Commit-Position: refs/heads/master@{#304114} TBR=jam@chromium.org,jamesr@chromium.org NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/728043002 Cr-Commit-Position: refs/heads/master@{#304305} --- mojo/edk/embedder/channel_init.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'mojo/edk/embedder/channel_init.cc') diff --git a/mojo/edk/embedder/channel_init.cc b/mojo/edk/embedder/channel_init.cc index 0e7a7b6..9ea984b 100644 --- a/mojo/edk/embedder/channel_init.cc +++ b/mojo/edk/embedder/channel_init.cc @@ -25,11 +25,12 @@ 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(); } -- cgit v1.1