| Index: mojo/edk/embedder/embedder.cc
|
| diff --git a/mojo/edk/embedder/embedder.cc b/mojo/edk/embedder/embedder.cc
|
| index 523b368d07e3f61ccb821f9ed14c0fd138b007c7..9ed0f408ad92fc4bd3d2a99cca3479c8140a64a3 100644
|
| --- a/mojo/edk/embedder/embedder.cc
|
| +++ b/mojo/edk/embedder/embedder.cc
|
| @@ -9,7 +9,6 @@
|
| #include "base/bind_helpers.h"
|
| #include "base/location.h"
|
| #include "base/logging.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/task_runner.h"
|
| #include "mojo/edk/embedder/embedder_internal.h"
|
| #include "mojo/edk/embedder/master_process_delegate.h"
|
| @@ -82,7 +81,7 @@ Configuration* GetConfiguration() {
|
| return system::GetMutableConfiguration();
|
| }
|
|
|
| -void Init(scoped_ptr<PlatformSupport> platform_support) {
|
| +void Init(std::unique_ptr<PlatformSupport> platform_support) {
|
| DCHECK(platform_support);
|
|
|
| DCHECK(!internal::g_platform_support);
|
| @@ -264,7 +263,7 @@ ScopedMessagePipeHandle CreateChannel(
|
| internal::g_ipc_support->channel_manager();
|
|
|
| system::ChannelId channel_id = MakeChannelId();
|
| - scoped_ptr<ChannelInfo> channel_info(new ChannelInfo(channel_id));
|
| + std::unique_ptr<ChannelInfo> channel_info(new ChannelInfo(channel_id));
|
| scoped_refptr<system::MessagePipeDispatcher> dispatcher =
|
| channel_manager->CreateChannel(
|
| channel_id, platform_handle.Pass(),
|
|
|