| Index: chromecast/common/media/shared_memory_chunk.h
|
| diff --git a/chromecast/common/media/shared_memory_chunk.h b/chromecast/common/media/shared_memory_chunk.h
|
| index 1dc506398c546161d08aa346a998029918f9af14..f68f707a05174628a9e1d3b2f48a12c6a050eb2e 100644
|
| --- a/chromecast/common/media/shared_memory_chunk.h
|
| +++ b/chromecast/common/media/shared_memory_chunk.h
|
| @@ -7,8 +7,9 @@
|
|
|
| #include <stddef.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chromecast/media/cma/ipc/media_memory_chunk.h"
|
|
|
| namespace base {
|
| @@ -20,7 +21,7 @@ namespace media {
|
|
|
| class SharedMemoryChunk : public MediaMemoryChunk {
|
| public:
|
| - SharedMemoryChunk(scoped_ptr<base::SharedMemory> shared_mem,
|
| + SharedMemoryChunk(std::unique_ptr<base::SharedMemory> shared_mem,
|
| size_t size);
|
| ~SharedMemoryChunk() override;
|
|
|
| @@ -30,7 +31,7 @@ class SharedMemoryChunk : public MediaMemoryChunk {
|
| bool valid() const override;
|
|
|
| private:
|
| - scoped_ptr<base::SharedMemory> shared_mem_;
|
| + std::unique_ptr<base::SharedMemory> shared_mem_;
|
| size_t size_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(SharedMemoryChunk);
|
| @@ -39,4 +40,4 @@ class SharedMemoryChunk : public MediaMemoryChunk {
|
| } // namespace media
|
| } // namespace chromecast
|
|
|
| -#endif // CHROMECAST_COMMON_MEDIA_SHARED_MEMORY_CHUNK_H_
|
| +#endif // CHROMECAST_COMMON_MEDIA_SHARED_MEMORY_CHUNK_H_
|
|
|