| Index: third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.cc
|
| diff --git a/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.cc b/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.cc
|
| index d2b5984c85ed9ffb980cd0b42e1ae614c688e6c9..71ebae9e34bafe4711e14d2ba8bf0e3a4e3dd79b 100644
|
| --- a/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.cc
|
| +++ b/third_party/crashpad/crashpad/snapshot/minidump/process_snapshot_minidump.cc
|
| @@ -12,13 +12,13 @@
|
| // See the License for the specific language governing permissions and
|
| // limitations under the License.
|
|
|
| -#include "snapshot/minidump/process_snapshot_minidump.h"
|
| -
|
| +#include <memory>
|
| #include <utility>
|
|
|
| -#include "base/memory/scoped_ptr.h"
|
| -#include "util/file/file_io.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "snapshot/minidump/minidump_simple_string_dictionary_reader.h"
|
| +#include "snapshot/minidump/process_snapshot_minidump.h"
|
| +#include "util/file/file_io.h"
|
|
|
| namespace crashpad {
|
|
|
| @@ -277,7 +277,7 @@ bool ProcessSnapshotMinidump::InitializeModules() {
|
| ? &module_crashpad_info_it->second
|
| : nullptr;
|
|
|
| - auto module = make_scoped_ptr(new internal::ModuleSnapshotMinidump());
|
| + auto module = base::WrapUnique(new internal::ModuleSnapshotMinidump());
|
| if (!module->Initialize(
|
| file_reader_, module_rva, module_crashpad_info_location)) {
|
| return false;
|
| @@ -325,7 +325,7 @@ bool ProcessSnapshotMinidump::InitializeModulesCrashpadInfo(
|
| return false;
|
| }
|
|
|
| - scoped_ptr<MinidumpModuleCrashpadInfoLink[]> minidump_links(
|
| + std::unique_ptr<MinidumpModuleCrashpadInfoLink[]> minidump_links(
|
| new MinidumpModuleCrashpadInfoLink[crashpad_module_count]);
|
| if (!file_reader_->ReadExactly(
|
| &minidump_links[0],
|
|
|