| Index: ui/base/resource/data_pack.h
|
| diff --git a/ui/base/resource/data_pack.h b/ui/base/resource/data_pack.h
|
| index 1292203a6bbf2a160265a98b705558b56473deae..46578186f23161a22b61e0924ad6a84d82d95c1b 100644
|
| --- a/ui/base/resource/data_pack.h
|
| +++ b/ui/base/resource/data_pack.h
|
| @@ -13,11 +13,11 @@
|
| #include <stdint.h>
|
|
|
| #include <map>
|
| +#include <memory>
|
|
|
| #include "base/files/file.h"
|
| #include "base/files/memory_mapped_file.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/strings/string_piece.h"
|
| #include "ui/base/resource/data_pack_export.h"
|
| @@ -79,7 +79,7 @@ class UI_DATA_PACK_EXPORT DataPack : public ResourceHandle {
|
| bool LoadImpl();
|
|
|
| // The memory-mapped data.
|
| - scoped_ptr<base::MemoryMappedFile> mmap_;
|
| + std::unique_ptr<base::MemoryMappedFile> mmap_;
|
|
|
| // Number of resources in the data.
|
| size_t resource_count_;
|
|
|