Index: mojo/edk/embedder/embedder.cc |
diff --git a/mojo/edk/embedder/embedder.cc b/mojo/edk/embedder/embedder.cc |
index fa90bc48f2759aafc1b8fe2508117bda85133aeb..74b38ddd9d7a1c9024726ae80cda46a8e00fc2a5 100644 |
--- a/mojo/edk/embedder/embedder.cc |
+++ b/mojo/edk/embedder/embedder.cc |
@@ -25,6 +25,7 @@ |
#include "mojo/edk/system/raw_channel.h" |
#include "mojo/edk/util/ref_ptr.h" |
+using mojo::platform::TaskRunner; |
using mojo::util::RefPtr; |
namespace mojo { |
@@ -65,7 +66,7 @@ system::ChannelId MakeChannelId() { |
// Note: Called on the I/O thread. |
void ShutdownIPCSupportHelper() { |
// Save these before they get nuked by |ShutdownChannelOnIOThread()|. |
- RefPtr<PlatformTaskRunner> delegate_thread_task_runner( |
+ RefPtr<TaskRunner> delegate_thread_task_runner( |
internal::g_ipc_support->delegate_thread_task_runner()); |
ProcessDelegate* process_delegate = |
internal::g_ipc_support->process_delegate(); |
@@ -139,9 +140,9 @@ MojoResult PassWrappedPlatformHandle(MojoHandle platform_handle_wrapper_handle, |
} |
void InitIPCSupport(ProcessType process_type, |
- RefPtr<PlatformTaskRunner>&& delegate_thread_task_runner, |
+ RefPtr<TaskRunner>&& delegate_thread_task_runner, |
ProcessDelegate* process_delegate, |
- RefPtr<PlatformTaskRunner>&& io_thread_task_runner, |
+ RefPtr<TaskRunner>&& io_thread_task_runner, |
ScopedPlatformHandle platform_handle) { |
// |Init()| must have already been called. |
DCHECK(internal::g_core); |
@@ -173,7 +174,7 @@ ScopedMessagePipeHandle ConnectToSlave( |
SlaveInfo slave_info, |
ScopedPlatformHandle platform_handle, |
const base::Closure& did_connect_to_slave_callback, |
- RefPtr<PlatformTaskRunner>&& did_connect_to_slave_runner, |
+ RefPtr<TaskRunner>&& did_connect_to_slave_runner, |
std::string* platform_connection_id, |
ChannelInfo** channel_info) { |
DCHECK(platform_connection_id); |
@@ -200,7 +201,7 @@ ScopedMessagePipeHandle ConnectToSlave( |
ScopedMessagePipeHandle ConnectToMaster( |
const std::string& platform_connection_id, |
const base::Closure& did_connect_to_master_callback, |
- RefPtr<PlatformTaskRunner>&& did_connect_to_master_runner, |
+ RefPtr<TaskRunner>&& did_connect_to_master_runner, |
ChannelInfo** channel_info) { |
DCHECK(channel_info); |
DCHECK(internal::g_ipc_support); |
@@ -248,7 +249,7 @@ ScopedMessagePipeHandle CreateChannelOnIOThread( |
ScopedMessagePipeHandle CreateChannel( |
ScopedPlatformHandle platform_handle, |
const base::Callback<void(ChannelInfo*)>& did_create_channel_callback, |
- RefPtr<PlatformTaskRunner>&& did_create_channel_runner) { |
+ RefPtr<TaskRunner>&& did_create_channel_runner) { |
DCHECK(platform_handle.is_valid()); |
DCHECK(!did_create_channel_callback.is_null()); |
DCHECK(internal::g_ipc_support); |
@@ -286,7 +287,7 @@ void DestroyChannelOnIOThread(ChannelInfo* channel_info) { |
// TODO(vtl): Write tests for this. |
void DestroyChannel(ChannelInfo* channel_info, |
const base::Closure& did_destroy_channel_callback, |
- RefPtr<PlatformTaskRunner>&& did_destroy_channel_runner) { |
+ RefPtr<TaskRunner>&& did_destroy_channel_runner) { |
DCHECK(channel_info); |
DCHECK(channel_info->channel_id); |
DCHECK(!did_destroy_channel_callback.is_null()); |