| Index: base/memory/shared_memory_mac_unittest.cc
|
| diff --git a/base/memory/shared_memory_mac_unittest.cc b/base/memory/shared_memory_mac_unittest.cc
|
| index bcb1f2b966971eefbbddf4652226ae96cb16e0f7..a44df9908a01e17913a98e3a407cc4f877a4ad0c 100644
|
| --- a/base/memory/shared_memory_mac_unittest.cc
|
| +++ b/base/memory/shared_memory_mac_unittest.cc
|
| @@ -54,13 +54,13 @@ bool GetProtections(void* address, size_t size, int* current, int* max) {
|
| }
|
|
|
| // Creates a new SharedMemory with the given |size|, filled with 'a'.
|
| -scoped_ptr<SharedMemory> CreateSharedMemory(int size) {
|
| +std::unique_ptr<SharedMemory> CreateSharedMemory(int size) {
|
| SharedMemoryHandle shm(size);
|
| if (!shm.IsValid()) {
|
| LOG(ERROR) << "Failed to make SharedMemoryHandle";
|
| return nullptr;
|
| }
|
| - scoped_ptr<SharedMemory> shared_memory(new SharedMemory(shm, false));
|
| + std::unique_ptr<SharedMemory> shared_memory(new SharedMemory(shm, false));
|
| shared_memory->Map(size);
|
| memset(shared_memory->memory(), 'a', size);
|
| return shared_memory;
|
| @@ -234,7 +234,8 @@ TEST_F(SharedMemoryMacMultiProcessTest, MachBasedSharedMemory) {
|
|
|
| SetUpChild("MachBasedSharedMemoryClient");
|
|
|
| - scoped_ptr<SharedMemory> shared_memory(CreateSharedMemory(s_memory_size));
|
| + std::unique_ptr<SharedMemory> shared_memory(
|
| + CreateSharedMemory(s_memory_size));
|
|
|
| // Send the underlying memory object to the client process.
|
| SendMachPort(client_port_.get(), shared_memory->handle().GetMemoryObject(),
|
| @@ -347,7 +348,8 @@ TEST_F(SharedMemoryMacMultiProcessTest, MachUnmapMap) {
|
|
|
| mach_msg_type_number_t active_name_count = GetActiveNameCount();
|
|
|
| - scoped_ptr<SharedMemory> shared_memory = CreateSharedMemory(s_memory_size);
|
| + std::unique_ptr<SharedMemory> shared_memory =
|
| + CreateSharedMemory(s_memory_size);
|
| ASSERT_TRUE(shared_memory->Unmap());
|
| ASSERT_TRUE(shared_memory->Map(s_memory_size));
|
| shared_memory.reset();
|
| @@ -370,7 +372,7 @@ TEST_F(SharedMemoryMacMultiProcessTest, MachSharedMemoryTakesOwnership) {
|
| EXPECT_EQ(active_name_count + 1, GetActiveNameCount());
|
|
|
| // Name count doesn't change when mapping the memory.
|
| - scoped_ptr<SharedMemory> shared_memory(new SharedMemory(shm, false));
|
| + std::unique_ptr<SharedMemory> shared_memory(new SharedMemory(shm, false));
|
| shared_memory->Map(s_memory_size);
|
| EXPECT_EQ(active_name_count + 1, GetActiveNameCount());
|
|
|
| @@ -385,7 +387,8 @@ TEST_F(SharedMemoryMacMultiProcessTest, MachReadOnly) {
|
| if (mac::IsOSSnowLeopard())
|
| return;
|
|
|
| - scoped_ptr<SharedMemory> shared_memory(CreateSharedMemory(s_memory_size));
|
| + std::unique_ptr<SharedMemory> shared_memory(
|
| + CreateSharedMemory(s_memory_size));
|
|
|
| SharedMemoryHandle shm2 = shared_memory->handle().Duplicate();
|
| ASSERT_TRUE(shm2.IsValid());
|
| @@ -403,7 +406,8 @@ TEST_F(SharedMemoryMacMultiProcessTest, MachShareToProcess) {
|
| mach_msg_type_number_t active_name_count = GetActiveNameCount();
|
|
|
| {
|
| - scoped_ptr<SharedMemory> shared_memory(CreateSharedMemory(s_memory_size));
|
| + std::unique_ptr<SharedMemory> shared_memory(
|
| + CreateSharedMemory(s_memory_size));
|
|
|
| SharedMemoryHandle shm2;
|
| ASSERT_TRUE(shared_memory->ShareToProcess(GetCurrentProcId(), &shm2));
|
| @@ -425,7 +429,8 @@ TEST_F(SharedMemoryMacMultiProcessTest, MachShareToProcessReadonly) {
|
| if (mac::IsOSSnowLeopard())
|
| return;
|
|
|
| - scoped_ptr<SharedMemory> shared_memory(CreateSharedMemory(s_memory_size));
|
| + std::unique_ptr<SharedMemory> shared_memory(
|
| + CreateSharedMemory(s_memory_size));
|
|
|
| // Check the protection levels.
|
| int current_prot, max_prot;
|
| @@ -471,7 +476,8 @@ TEST_F(SharedMemoryMacMultiProcessTest, MachShareToProcessReadonlyLeak) {
|
| mach_msg_type_number_t active_name_count = GetActiveNameCount();
|
|
|
| {
|
| - scoped_ptr<SharedMemory> shared_memory(CreateSharedMemory(s_memory_size));
|
| + std::unique_ptr<SharedMemory> shared_memory(
|
| + CreateSharedMemory(s_memory_size));
|
|
|
| SharedMemoryHandle shm2;
|
| ASSERT_TRUE(
|
|
|