Index: ppapi/shared_impl/media_stream_buffer_manager.h |
diff --git a/ppapi/shared_impl/media_stream_buffer_manager.h b/ppapi/shared_impl/media_stream_buffer_manager.h |
index d965b11b026a47ec6de7ac0a415a1cea3d0b0c8e..6a1cf0dd5d196222bf01a6a3a2e3cb2680a2f8c9 100644 |
--- a/ppapi/shared_impl/media_stream_buffer_manager.h |
+++ b/ppapi/shared_impl/media_stream_buffer_manager.h |
@@ -8,11 +8,11 @@ |
#include <stdint.h> |
#include <deque> |
+#include <memory> |
#include <vector> |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/shared_memory.h" |
#include "ppapi/shared_impl/ppapi_shared_export.h" |
@@ -61,7 +61,7 @@ class PPAPI_SHARED_EXPORT MediaStreamBufferManager { |
// Initializes shared memory for buffers transmission. |
bool SetBuffers(int32_t number_of_buffers, |
int32_t buffer_size, |
- scoped_ptr<base::SharedMemory> shm, |
+ std::unique_ptr<base::SharedMemory> shm, |
bool enqueue_all_buffers); |
// Dequeues a buffer from |buffer_queue_|. |
@@ -95,7 +95,7 @@ class PPAPI_SHARED_EXPORT MediaStreamBufferManager { |
int32_t number_of_buffers_; |
// A memory block shared between renderer process and plugin process. |
- scoped_ptr<base::SharedMemory> shm_; |
+ std::unique_ptr<base::SharedMemory> shm_; |
DISALLOW_COPY_AND_ASSIGN(MediaStreamBufferManager); |
}; |