Index: ppapi/proxy/video_decoder_resource.cc |
diff --git a/ppapi/proxy/video_decoder_resource.cc b/ppapi/proxy/video_decoder_resource.cc |
index 1519d1ae6531bb3af7ad5640c51950fbc58bb544..cb55764bff4360e6a104243be87344acdbaaea78 100644 |
--- a/ppapi/proxy/video_decoder_resource.cc |
+++ b/ppapi/proxy/video_decoder_resource.cc |
@@ -32,7 +32,7 @@ namespace ppapi { |
namespace proxy { |
VideoDecoderResource::ShmBuffer::ShmBuffer( |
- scoped_ptr<base::SharedMemory> shm_ptr, |
+ std::unique_ptr<base::SharedMemory> shm_ptr, |
uint32_t size, |
uint32_t shm_id) |
: shm(std::move(shm_ptr)), addr(NULL), shm_id(shm_id) { |
@@ -230,9 +230,9 @@ int32_t VideoDecoderResource::Decode(uint32_t decode_id, |
base::SharedMemoryHandle shm_handle = base::SharedMemory::NULLHandle(); |
if (!reply_params.TakeSharedMemoryHandleAtIndex(0, &shm_handle)) |
return PP_ERROR_NOMEMORY; |
- scoped_ptr<base::SharedMemory> shm( |
+ std::unique_ptr<base::SharedMemory> shm( |
new base::SharedMemory(shm_handle, false /* read_only */)); |
- scoped_ptr<ShmBuffer> shm_buffer( |
+ std::unique_ptr<ShmBuffer> shm_buffer( |
new ShmBuffer(std::move(shm), shm_size, shm_id)); |
if (!shm_buffer->addr) |
return PP_ERROR_NOMEMORY; |