Index: gpu/command_buffer/service/transfer_buffer_manager_unittest.cc |
diff --git a/gpu/command_buffer/service/transfer_buffer_manager_unittest.cc b/gpu/command_buffer/service/transfer_buffer_manager_unittest.cc |
index 56edaedbf3ac146f71ad97cd98425423e0613474..1e12ae68a643fd11edc50c0f43dde79570436f42 100644 |
--- a/gpu/command_buffer/service/transfer_buffer_manager_unittest.cc |
+++ b/gpu/command_buffer/service/transfer_buffer_manager_unittest.cc |
@@ -6,7 +6,8 @@ |
#include <stddef.h> |
-#include "base/memory/scoped_ptr.h" |
+#include <memory> |
+ |
#include "testing/gmock/include/gmock/gmock.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -40,10 +41,10 @@ TEST_F(TransferBufferManagerTest, OutOfRangeHandleMapsToNull) { |
} |
TEST_F(TransferBufferManagerTest, CanRegisterTransferBuffer) { |
- scoped_ptr<base::SharedMemory> shm(new base::SharedMemory()); |
+ std::unique_ptr<base::SharedMemory> shm(new base::SharedMemory()); |
shm->CreateAndMapAnonymous(kBufferSize); |
base::SharedMemory* shm_raw_pointer = shm.get(); |
- scoped_ptr<SharedMemoryBufferBacking> backing( |
+ std::unique_ptr<SharedMemoryBufferBacking> backing( |
new SharedMemoryBufferBacking(std::move(shm), kBufferSize)); |
SharedMemoryBufferBacking* backing_raw_ptr = backing.get(); |
@@ -63,14 +64,14 @@ class FakeBufferBacking : public BufferBacking { |
return reinterpret_cast<void*>(0xBADF00D0); |
} |
size_t GetSize() const override { return 42; } |
- static scoped_ptr<BufferBacking> Make() { |
- return scoped_ptr<BufferBacking>(new FakeBufferBacking); |
+ static std::unique_ptr<BufferBacking> Make() { |
+ return std::unique_ptr<BufferBacking>(new FakeBufferBacking); |
} |
}; |
TEST_F(TransferBufferManagerTest, CanDestroyTransferBuffer) { |
EXPECT_TRUE(transfer_buffer_manager_->RegisterTransferBuffer( |
- 1, scoped_ptr<BufferBacking>(new FakeBufferBacking))); |
+ 1, std::unique_ptr<BufferBacking>(new FakeBufferBacking))); |
transfer_buffer_manager_->DestroyTransferBuffer(1); |
scoped_refptr<Buffer> registered = |
transfer_buffer_manager_->GetTransferBuffer(1); |
@@ -106,7 +107,7 @@ TEST_F(TransferBufferManagerTest, CannotRegisterNullTransferBuffer) { |
} |
TEST_F(TransferBufferManagerTest, CannotRegisterNegativeTransferBufferId) { |
- scoped_ptr<base::SharedMemory> shm(new base::SharedMemory()); |
+ std::unique_ptr<base::SharedMemory> shm(new base::SharedMemory()); |
shm->CreateAndMapAnonymous(kBufferSize); |
EXPECT_FALSE(transfer_buffer_manager_->RegisterTransferBuffer( |
-1, FakeBufferBacking::Make())); |