| Index: mojo/edk/embedder/embedder.cc
|
| diff --git a/mojo/edk/embedder/embedder.cc b/mojo/edk/embedder/embedder.cc
|
| index 204fd206865cd7f85e79fda7822894b7ebd2907c..9e1e4627b351527cc15188470d6f74d9b4939e0b 100644
|
| --- a/mojo/edk/embedder/embedder.cc
|
| +++ b/mojo/edk/embedder/embedder.cc
|
| @@ -25,7 +25,9 @@
|
| #include "mojo/edk/system/message_pipe_dispatcher.h"
|
| #include "mojo/edk/system/platform_handle_dispatcher.h"
|
| #include "mojo/edk/system/raw_channel.h"
|
| -#include "mojo/edk/system/ref_ptr.h"
|
| +#include "mojo/edk/util/ref_ptr.h"
|
| +
|
| +using mojo::util::RefPtr;
|
|
|
| namespace mojo {
|
| namespace embedder {
|
| @@ -184,7 +186,7 @@ ScopedMessagePipeHandle ConnectToSlave(
|
| internal::g_ipc_support->GenerateConnectionIdentifier();
|
| *platform_connection_id = connection_id.ToString();
|
| system::ChannelId channel_id = system::kInvalidChannelId;
|
| - system::RefPtr<system::MessagePipeDispatcher> dispatcher =
|
| + RefPtr<system::MessagePipeDispatcher> dispatcher =
|
| internal::g_ipc_support->ConnectToSlave(
|
| connection_id, slave_info, platform_handle.Pass(),
|
| did_connect_to_slave_callback, std::move(did_connect_to_slave_runner),
|
| @@ -211,7 +213,7 @@ ScopedMessagePipeHandle ConnectToMaster(
|
| CHECK(ok);
|
|
|
| system::ChannelId channel_id = system::kInvalidChannelId;
|
| - system::RefPtr<system::MessagePipeDispatcher> dispatcher =
|
| + RefPtr<system::MessagePipeDispatcher> dispatcher =
|
| internal::g_ipc_support->ConnectToMaster(
|
| connection_id, did_connect_to_master_callback,
|
| std::move(did_connect_to_master_runner), &channel_id);
|
| @@ -235,7 +237,7 @@ ScopedMessagePipeHandle CreateChannelOnIOThread(
|
| internal::g_ipc_support->channel_manager();
|
|
|
| *channel_info = new ChannelInfo(MakeChannelId());
|
| - system::RefPtr<system::MessagePipeDispatcher> dispatcher =
|
| + RefPtr<system::MessagePipeDispatcher> dispatcher =
|
| channel_manager->CreateChannelOnIOThread((*channel_info)->channel_id,
|
| platform_handle.Pass());
|
|
|
| @@ -258,7 +260,7 @@ ScopedMessagePipeHandle CreateChannel(
|
|
|
| system::ChannelId channel_id = MakeChannelId();
|
| std::unique_ptr<ChannelInfo> channel_info(new ChannelInfo(channel_id));
|
| - system::RefPtr<system::MessagePipeDispatcher> dispatcher =
|
| + RefPtr<system::MessagePipeDispatcher> dispatcher =
|
| channel_manager->CreateChannel(
|
| channel_id, platform_handle.Pass(),
|
| base::Bind(did_create_channel_callback,
|
|
|