| Index: third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader.h
|
| diff --git a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader.h b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader.h
|
| index 883a756abc4de85c4174ef5ce73ba688f7442161..d211ce9c66fce90a762853bae8cfcf4f6559452e 100644
|
| --- a/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader.h
|
| +++ b/third_party/crashpad/crashpad/snapshot/mac/mach_o_image_reader.h
|
| @@ -20,10 +20,10 @@
|
| #include <sys/types.h>
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "snapshot/mac/process_types.h"
|
| #include "util/misc/initialization_state_dcheck.h"
|
| #include "util/misc/uuid.h"
|
| @@ -326,16 +326,16 @@ class MachOImageReader {
|
| mach_vm_size_t size_;
|
| mach_vm_size_t slide_;
|
| uint64_t source_version_;
|
| - scoped_ptr<process_types::symtab_command> symtab_command_;
|
| - scoped_ptr<process_types::dysymtab_command> dysymtab_command_;
|
| + std::unique_ptr<process_types::symtab_command> symtab_command_;
|
| + std::unique_ptr<process_types::dysymtab_command> dysymtab_command_;
|
|
|
| // symbol_table_ (and symbol_table_initialized_) are mutable in order to
|
| // maintain LookUpExternalDefinedSymbol() as a const interface while allowing
|
| // lazy initialization via InitializeSymbolTable(). This is logical
|
| // const-ness, not physical const-ness.
|
| - mutable scoped_ptr<MachOImageSymbolTableReader> symbol_table_;
|
| + mutable std::unique_ptr<MachOImageSymbolTableReader> symbol_table_;
|
|
|
| - scoped_ptr<process_types::dylib_command> id_dylib_command_;
|
| + std::unique_ptr<process_types::dylib_command> id_dylib_command_;
|
| ProcessReader* process_reader_; // weak
|
| uint32_t file_type_;
|
| InitializationStateDcheck initialized_;
|
|
|