| Index: gpu/command_buffer/client/mapped_memory.h
|
| diff --git a/gpu/command_buffer/client/mapped_memory.h b/gpu/command_buffer/client/mapped_memory.h
|
| index 7083159904554b6b2d886204c0e9eb8d84ca53f5..0af38b56e92f02b92043fd0e286e3fc9b6108fa0 100644
|
| --- a/gpu/command_buffer/client/mapped_memory.h
|
| +++ b/gpu/command_buffer/client/mapped_memory.h
|
| @@ -8,9 +8,10 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| +
|
| #include "base/bind.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/trace_event/memory_dump_provider.h"
|
| #include "gpu/command_buffer/client/fenced_allocator.h"
|
| #include "gpu/command_buffer/common/buffer.h"
|
| @@ -201,7 +202,7 @@ class GPU_EXPORT MappedMemoryManager
|
| }
|
|
|
| private:
|
| - typedef std::vector<scoped_ptr<MemoryChunk>> MemoryChunkVector;
|
| + typedef std::vector<std::unique_ptr<MemoryChunk>> MemoryChunkVector;
|
|
|
| // size a chunk is rounded up to.
|
| unsigned int chunk_size_multiple_;
|
|
|