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

Unified Diff: content/common/mojo/channel_init.cc

Issue 1179733005: Update mojo sdk to rev bdbb0c7e396fc4044a8b194058d7a7e529715286 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update CommandBufferImpl (Binding::OnConnectionError is no more) Created 5 years, 6 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
« no previous file with comments | « components/view_manager/gles2/command_buffer_impl.cc ('k') | mojo/runner/child_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/mojo/channel_init.cc
diff --git a/content/common/mojo/channel_init.cc b/content/common/mojo/channel_init.cc
index c2d4bf25cb918361e46590303f1b5cb8be0e40c6..e81515c2da0eda8f573fd5a418817fed7b2c33c9 100644
--- a/content/common/mojo/channel_init.cc
+++ b/content/common/mojo/channel_init.cc
@@ -8,6 +8,7 @@
#include "base/bind_helpers.h"
#include "base/lazy_instance.h"
#include "base/message_loop/message_loop.h"
+#include "base/thread_task_runner_handle.h"
#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
namespace content {
@@ -29,11 +30,10 @@ mojo::ScopedMessagePipeHandle ChannelInit::Init(
mojo::embedder::CreateChannel(
mojo::embedder::ScopedPlatformHandle(
mojo::embedder::PlatformHandle(file)),
- io_thread_task_runner,
base::Bind(&ChannelInit::OnCreatedChannel,
weak_factory_.GetWeakPtr(),
base::Passed(&ipc_support)),
- base::MessageLoop::current()->task_runner()).Pass();
+ base::ThreadTaskRunnerHandle::Get()).Pass();
return message_pipe.Pass();
}
« no previous file with comments | « components/view_manager/gles2/command_buffer_impl.cc ('k') | mojo/runner/child_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698