commit 03de39b2f64eb2e9fbe69947be3d10042f30469e
author danakj <danakj@chromium.org> Sat Apr 23 04:21:09 2016
committer Commit bot <commit-bot@chromium.org> Sat Apr 23 04:22:06 2016
tree 1cf11b4d12d67144ab368d569f6b514a8448099d
parent 34a7a8cbbf500710c5867a5ecb7cdc6ba369e2cb

Convert scoped_ptr to std::unique_ptr in //ipc.

TBR=brettw, jam, tsepez@chromium.org
BUG=554298

Review URL: https://codereview.chromium.org/1913363002

Cr-Commit-Position: refs/heads/master@{#389361}

ipc/attachment_broker_privileged_win_unittest.cc

diff --git a/ipc/attachment_broker_privileged_win_unittest.cc b/ipc/attachment_broker_privileged_win_unittest.cc
index 3ab91119..dc3bffc 100644
--- a/ipc/attachment_broker_privileged_win_unittest.cc
+++ b/ipc/attachment_broker_privileged_win_unittest.cc
@@ -6,12 +6,12 @@
 
 #include <windows.h>
 
+#include <memory>
 #include <tuple>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/shared_memory.h"
 #include "base/memory/shared_memory_handle.h"
 #include "base/win/scoped_handle.h"
@@ -83,7 +83,7 @@
 }
 
 // Returns a mapped, shared memory region based on the handle in |message|.
-scoped_ptr<base::SharedMemory> GetSharedMemoryFromSharedMemoryHandleMsg1(
+std::unique_ptr<base::SharedMemory> GetSharedMemoryFromSharedMemoryHandleMsg1(
     const IPC::Message& message,
     size_t size) {
   // Expect a message with a brokered attachment.
@@ -100,7 +100,7 @@
   }
 
   base::SharedMemoryHandle handle = std::get<0>(p);
-  scoped_ptr<base::SharedMemory> shared_memory(
+  std::unique_ptr<base::SharedMemory> shared_memory(
       new base::SharedMemory(handle, false));
 
   shared_memory->Map(size);
@@ -313,7 +313,7 @@
   base::ScopedTempDir temp_dir_;
   base::FilePath temp_path_;
   ProxyListener proxy_listener_;
-  scoped_ptr<IPC::AttachmentBrokerUnprivilegedWin> broker_;
+  std::unique_ptr<IPC::AttachmentBrokerUnprivilegedWin> broker_;
   MockObserver observer_;
   DWORD handle_count_;
 };
@@ -479,7 +479,7 @@
   ResultListener result_listener;
   get_proxy_listener()->set_listener(&result_listener);
 
-  scoped_ptr<base::SharedMemory> shared_memory(new base::SharedMemory);
+  std::unique_ptr<base::SharedMemory> shared_memory(new base::SharedMemory);
   shared_memory->CreateAndMapAnonymous(kSharedMemorySize);
   memcpy(shared_memory->memory(), kDataBuffer, strlen(kDataBuffer));
   sender()->Send(new TestSharedMemoryHandleMsg1(shared_memory->handle()));
@@ -504,7 +504,7 @@
 
   // Set up IPC channel.
   IPC::AttachmentBrokerPrivilegedWin broker;
-  scoped_ptr<IPC::Channel> channel(IPC::Channel::CreateClient(
+  std::unique_ptr<IPC::Channel> channel(IPC::Channel::CreateClient(
       IPCTestBase::GetChannelName(channel_name), &listener));
   broker.RegisterCommunicationChannel(channel.get(), nullptr);
   CHECK(channel->Connect());
@@ -639,7 +639,7 @@
 
 void SendSharedMemoryHandleCallback(IPC::Sender* sender,
                                     const IPC::Message& message) {
-  scoped_ptr<base::SharedMemory> shared_memory =
+  std::unique_ptr<base::SharedMemory> shared_memory =
       GetSharedMemoryFromSharedMemoryHandleMsg1(message, kSharedMemorySize);
   bool success =
       memcmp(shared_memory->memory(), kDataBuffer, strlen(kDataBuffer)) == 0;