Chromium Code Reviews| Index: ppapi/shared_impl/media_stream_buffer_manager_unittest.cc |
| diff --git a/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc b/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc |
| index 4bb250a2c66e39a2a35e6acd7773b246361c258f..1cc9423fb9c9745f6b921736b3c568fcec53dc01 100644 |
| --- a/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc |
| +++ b/ppapi/shared_impl/media_stream_buffer_manager_unittest.cc |
| @@ -6,9 +6,9 @@ |
| #include <stdint.h> |
| +#include <memory> |
|
bbudge
2016/04/06 21:01:20
Is included by media_stream_buffer_manager.h
dcheng
2016/04/06 21:18:33
Done.
|
| #include <utility> |
| -#include "base/memory/scoped_ptr.h" |
| #include "base/memory/shared_memory.h" |
| #include "ppapi/c/pp_errors.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| @@ -18,9 +18,9 @@ using base::SharedMemoryCreateOptions; |
| namespace { |
| -scoped_ptr<SharedMemory> CreateSharedMemory(int32_t buffer_size, |
| - int32_t number_of_buffers) { |
| - scoped_ptr<SharedMemory> shared_memory(new SharedMemory()); |
| +std::unique_ptr<SharedMemory> CreateSharedMemory(int32_t buffer_size, |
| + int32_t number_of_buffers) { |
| + std::unique_ptr<SharedMemory> shared_memory(new SharedMemory()); |
| SharedMemoryCreateOptions options; |
| options.size = buffer_size * number_of_buffers; |
| options.executable = false; |
| @@ -48,7 +48,7 @@ TEST(MediaStreamBufferManager, General) { |
| const int32_t kBufferSize = 128; |
| MockDelegate delegate; |
| MediaStreamBufferManager manager(&delegate); |
| - scoped_ptr<SharedMemory> shared_memory = |
| + std::unique_ptr<SharedMemory> shared_memory = |
| CreateSharedMemory(kBufferSize, kNumberOfBuffers); |
| // SetBuffers with enqueue_all_buffers = true; |
| EXPECT_TRUE(manager.SetBuffers(kNumberOfBuffers, kBufferSize, |
| @@ -105,7 +105,7 @@ TEST(MediaStreamBufferManager, General) { |
| const int32_t kBufferSize = 128; |
| MockDelegate delegate; |
| MediaStreamBufferManager manager(&delegate); |
| - scoped_ptr<SharedMemory> shared_memory = |
| + std::unique_ptr<SharedMemory> shared_memory = |
| CreateSharedMemory(kBufferSize, kNumberOfBuffers); |
| // SetBuffers with enqueue_all_buffers = false; |
| EXPECT_TRUE(manager.SetBuffers(kNumberOfBuffers, kBufferSize, |
| @@ -134,7 +134,7 @@ TEST(MediaStreamBufferManager, ResetBuffers) { |
| MockDelegate delegate; |
| MediaStreamBufferManager manager(&delegate); |
| { |
| - scoped_ptr<SharedMemory> shared_memory(new SharedMemory()); |
| + std::unique_ptr<SharedMemory> shared_memory(new SharedMemory()); |
| SharedMemoryCreateOptions options; |
| options.size = kBufferSize1 * kNumberOfBuffers1; |
| options.executable = false; |
| @@ -160,7 +160,7 @@ TEST(MediaStreamBufferManager, ResetBuffers) { |
| } |
| { |
| - scoped_ptr<SharedMemory> shared_memory = |
| + std::unique_ptr<SharedMemory> shared_memory = |
| CreateSharedMemory(kBufferSize2, kNumberOfBuffers2); |
| // SetBuffers with enqueue_all_buffers = true; |
| EXPECT_TRUE(manager.SetBuffers(kNumberOfBuffers2, kBufferSize2, |