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

Unified Diff: mojo/edk/test/scoped_ipc_support.cc

Issue 1462083003: Add //mojo/edk/platform and move platform_task_runners.h there. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: update readme Created 5 years, 1 month 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: mojo/edk/test/scoped_ipc_support.cc
diff --git a/mojo/edk/test/scoped_ipc_support.cc b/mojo/edk/test/scoped_ipc_support.cc
index 9e6a8012a67b7cf51606985b66932cec2b8f799f..a35100d998088e0a903158c3d870612a22b41934 100644
--- a/mojo/edk/test/scoped_ipc_support.cc
+++ b/mojo/edk/test/scoped_ipc_support.cc
@@ -7,6 +7,7 @@
#include "base/message_loop/message_loop.h"
#include "mojo/edk/embedder/embedder.h"
+using mojo::platform::TaskRunner;
using mojo::util::RefPtr;
namespace mojo {
@@ -28,7 +29,7 @@ ScopedIPCSupportHelper::~ScopedIPCSupportHelper() {
void ScopedIPCSupportHelper::Init(
embedder::ProcessType process_type,
embedder::ProcessDelegate* process_delegate,
- RefPtr<embedder::PlatformTaskRunner>&& io_thread_task_runner,
+ RefPtr<TaskRunner>&& io_thread_task_runner,
embedder::ScopedPlatformHandle platform_handle) {
io_thread_task_runner_ = std::move(io_thread_task_runner);
// Note: Run delegate methods on the I/O thread.
@@ -43,8 +44,7 @@ void ScopedIPCSupportHelper::OnShutdownCompleteImpl() {
} // namespace internal
-ScopedIPCSupport::ScopedIPCSupport(
- RefPtr<embedder::PlatformTaskRunner>&& io_thread_task_runner) {
+ScopedIPCSupport::ScopedIPCSupport(RefPtr<TaskRunner>&& io_thread_task_runner) {
helper_.Init(embedder::ProcessType::NONE, this,
std::move(io_thread_task_runner),
embedder::ScopedPlatformHandle());
@@ -58,14 +58,14 @@ void ScopedIPCSupport::OnShutdownComplete() {
}
ScopedMasterIPCSupport::ScopedMasterIPCSupport(
- RefPtr<embedder::PlatformTaskRunner>&& io_thread_task_runner) {
+ RefPtr<TaskRunner>&& io_thread_task_runner) {
helper_.Init(embedder::ProcessType::MASTER, this,
std::move(io_thread_task_runner),
embedder::ScopedPlatformHandle());
}
ScopedMasterIPCSupport::ScopedMasterIPCSupport(
- RefPtr<embedder::PlatformTaskRunner>&& io_thread_task_runner,
+ RefPtr<TaskRunner>&& io_thread_task_runner,
base::Callback<void(embedder::SlaveInfo slave_info)> on_slave_disconnect)
: on_slave_disconnect_(on_slave_disconnect) {
helper_.Init(embedder::ProcessType::MASTER, this,
@@ -86,14 +86,14 @@ void ScopedMasterIPCSupport::OnSlaveDisconnect(embedder::SlaveInfo slave_info) {
}
ScopedSlaveIPCSupport::ScopedSlaveIPCSupport(
- RefPtr<embedder::PlatformTaskRunner>&& io_thread_task_runner,
+ RefPtr<TaskRunner>&& io_thread_task_runner,
embedder::ScopedPlatformHandle platform_handle) {
helper_.Init(embedder::ProcessType::SLAVE, this,
std::move(io_thread_task_runner), platform_handle.Pass());
}
ScopedSlaveIPCSupport::ScopedSlaveIPCSupport(
- RefPtr<embedder::PlatformTaskRunner>&& io_thread_task_runner,
+ RefPtr<TaskRunner>&& io_thread_task_runner,
embedder::ScopedPlatformHandle platform_handle,
base::Closure on_master_disconnect)
: on_master_disconnect_(on_master_disconnect) {

Powered by Google App Engine
This is Rietveld 408576698