| Index: third_party/zlib/google/zip_reader.h
|
| diff --git a/third_party/zlib/google/zip_reader.h b/third_party/zlib/google/zip_reader.h
|
| index 27cc81f4b5e688c011484b0d937125bc09d432dd..c1b6fb3364abeba3c34231e9dd1fea500540029e 100644
|
| --- a/third_party/zlib/google/zip_reader.h
|
| +++ b/third_party/zlib/google/zip_reader.h
|
| @@ -7,6 +7,7 @@
|
| #include <stddef.h>
|
| #include <stdint.h>
|
|
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/callback.h"
|
| @@ -14,7 +15,6 @@
|
| #include "base/files/file_path.h"
|
| #include "base/files/file_util.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/time/time.h"
|
|
|
| @@ -245,7 +245,7 @@ class ZipReader {
|
| unzFile zip_file_;
|
| int num_entries_;
|
| bool reached_end_;
|
| - scoped_ptr<EntryInfo> current_entry_info_;
|
| + std::unique_ptr<EntryInfo> current_entry_info_;
|
|
|
| base::WeakPtrFactory<ZipReader> weak_ptr_factory_;
|
|
|
|
|