| Index: ppapi/proxy/proxy_channel.h
|
| diff --git a/ppapi/proxy/proxy_channel.h b/ppapi/proxy/proxy_channel.h
|
| index 0e657f73ad51bebd270cc423a8e15bd003c75e6b..9d981da9e0e93d15a7a07bbc0d197cb78c86b1b4 100644
|
| --- a/ppapi/proxy/proxy_channel.h
|
| +++ b/ppapi/proxy/proxy_channel.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef PPAPI_PROXY_PROXY_CHANNEL_H_
|
| #define PPAPI_PROXY_PROXY_CHANNEL_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/files/scoped_file.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/shared_memory.h"
|
| #include "base/process/process.h"
|
| #include "build/build_config.h"
|
| @@ -136,7 +137,7 @@ class PPAPI_PROXY_EXPORT ProxyChannel
|
|
|
| // Will be null for some tests when there is a test_sink_, and if the
|
| // remote side has crashed.
|
| - scoped_ptr<IPC::SyncChannel> channel_;
|
| + std::unique_ptr<IPC::SyncChannel> channel_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(ProxyChannel);
|
| };
|
|
|