1 files changed, 11 insertions, 10 deletions

diff --git a/chromium/ipc/ipc_channel.h b/chromium/ipc/ipc_channel.h
index a008e7e15d5..fdd0b352964 100644
--- a/chromium/ipc/ipc_channel.h
+++ b/chromium/ipc/ipc_channel.h
@@ -8,11 +8,11 @@
 #include <stddef.h>
 #include <stdint.h>
 
+#include <memory>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/files/scoped_file.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/process/process.h"
 #include "build/build_config.h"
 #include "ipc/ipc_channel_handle.h"
@@ -127,11 +127,12 @@ class IPC_EXPORT Channel : public Endpoint {
   // Each mode has its own Create*() API to create the Channel object.
   //
   // TODO(morrita): Replace CreateByModeForProxy() with one of above Create*().
-  static scoped_ptr<Channel> Create(const IPC::ChannelHandle& channel_handle,
-                                    Mode mode,
-                                    Listener* listener);
+  static std::unique_ptr<Channel> Create(
+      const IPC::ChannelHandle& channel_handle,
+      Mode mode,
+      Listener* listener);
 
-  static scoped_ptr<Channel> CreateClient(
+  static std::unique_ptr<Channel> CreateClient(
       const IPC::ChannelHandle& channel_handle,
       Listener* listener);
 
@@ -140,21 +141,21 @@ class IPC_EXPORT Channel : public Endpoint {
   // from other processes. Named channels work via named unix domain sockets.
   // On Windows MODE_NAMED_SERVER is equivalent to MODE_SERVER and
   // MODE_NAMED_CLIENT is equivalent to MODE_CLIENT.
-  static scoped_ptr<Channel> CreateNamedServer(
+  static std::unique_ptr<Channel> CreateNamedServer(
       const IPC::ChannelHandle& channel_handle,
       Listener* listener);
-  static scoped_ptr<Channel> CreateNamedClient(
+  static std::unique_ptr<Channel> CreateNamedClient(
       const IPC::ChannelHandle& channel_handle,
       Listener* listener);
 #if defined(OS_POSIX)
   // An "open" named server accepts connections from ANY client.
   // The caller must then implement their own access-control based on the
   // client process' user Id.
-  static scoped_ptr<Channel> CreateOpenNamedServer(
+  static std::unique_ptr<Channel> CreateOpenNamedServer(
       const IPC::ChannelHandle& channel_handle,
       Listener* listener);
 #endif
-  static scoped_ptr<Channel> CreateServer(
+  static std::unique_ptr<Channel> CreateServer(
       const IPC::ChannelHandle& channel_handle,
       Listener* listener);
 
@@ -254,7 +255,7 @@ class IPC_EXPORT Channel : public Endpoint {
     Message* get_message() const { return message_.get(); }
 
    private:
-    scoped_ptr<Message> message_;
+    std::unique_ptr<Message> message_;
     void* buffer_;
     size_t length_;
   };