| Index: third_party/crashpad/crashpad/minidump/minidump_module_writer.cc
|
| diff --git a/third_party/crashpad/crashpad/minidump/minidump_module_writer.cc b/third_party/crashpad/crashpad/minidump/minidump_module_writer.cc
|
| index 8cbf855f92ebf510a35a405ebc11c05d83febfd7..c3a0e8396bc49d8d23ae88d52ff8ae063526f739 100644
|
| --- a/third_party/crashpad/crashpad/minidump/minidump_module_writer.cc
|
| +++ b/third_party/crashpad/crashpad/minidump/minidump_module_writer.cc
|
| @@ -17,6 +17,7 @@
|
| #include <sys/types.h>
|
|
|
| #include <limits>
|
| +#include <utility>
|
|
|
| #include "base/logging.h"
|
| #include "base/numerics/safe_conversions.h"
|
| @@ -25,7 +26,6 @@
|
| #include "snapshot/module_snapshot.h"
|
| #include "util/file/file_writer.h"
|
| #include "util/misc/implicit_cast.h"
|
| -#include "util/stdlib/move.h"
|
| #include "util/numeric/in_range_cast.h"
|
| #include "util/numeric/safe_assignment.h"
|
|
|
| @@ -245,7 +245,7 @@ void MinidumpModuleWriter::InitializeFromSnapshot(
|
| auto codeview_record =
|
| make_scoped_ptr(new MinidumpModuleCodeViewRecordPDB70Writer());
|
| codeview_record->InitializeFromSnapshot(module_snapshot);
|
| - SetCodeViewRecord(crashpad::move(codeview_record));
|
| + SetCodeViewRecord(std::move(codeview_record));
|
| }
|
|
|
| const MINIDUMP_MODULE* MinidumpModuleWriter::MinidumpModule() const {
|
| @@ -267,14 +267,14 @@ void MinidumpModuleWriter::SetCodeViewRecord(
|
| scoped_ptr<MinidumpModuleCodeViewRecordWriter> codeview_record) {
|
| DCHECK_EQ(state(), kStateMutable);
|
|
|
| - codeview_record_ = crashpad::move(codeview_record);
|
| + codeview_record_ = std::move(codeview_record);
|
| }
|
|
|
| void MinidumpModuleWriter::SetMiscDebugRecord(
|
| scoped_ptr<MinidumpModuleMiscDebugRecordWriter> misc_debug_record) {
|
| DCHECK_EQ(state(), kStateMutable);
|
|
|
| - misc_debug_record_ = crashpad::move(misc_debug_record);
|
| + misc_debug_record_ = std::move(misc_debug_record);
|
| }
|
|
|
| void MinidumpModuleWriter::SetTimestamp(time_t timestamp) {
|
| @@ -386,7 +386,7 @@ void MinidumpModuleListWriter::InitializeFromSnapshot(
|
| for (const ModuleSnapshot* module_snapshot : module_snapshots) {
|
| auto module = make_scoped_ptr(new MinidumpModuleWriter());
|
| module->InitializeFromSnapshot(module_snapshot);
|
| - AddModule(crashpad::move(module));
|
| + AddModule(std::move(module));
|
| }
|
| }
|
|
|
|
|