Index: minidump/minidump_module_writer_test.cc |
diff --git a/minidump/minidump_module_writer_test.cc b/minidump/minidump_module_writer_test.cc |
index 9919b0c94dafed9bae6c51ceda34f84e58a8c2c6..8d6272decdfa38bb954226bdf05f835e9967e840 100644 |
--- a/minidump/minidump_module_writer_test.cc |
+++ b/minidump/minidump_module_writer_test.cc |
@@ -20,6 +20,8 @@ |
#include <string.h> |
#include <sys/types.h> |
+#include <utility> |
+ |
#include "base/format_macros.h" |
#include "base/strings/stringprintf.h" |
#include "base/strings/utf_string_conversions.h" |
@@ -33,7 +35,6 @@ |
#include "test/gtest_death_check.h" |
#include "util/file/string_file.h" |
#include "util/misc/implicit_cast.h" |
-#include "util/stdlib/move.h" |
#include "util/misc/uuid.h" |
#include "util/stdlib/pointer_container.h" |
@@ -69,7 +70,7 @@ TEST(MinidumpModuleWriter, EmptyModuleList) { |
MinidumpFileWriter minidump_file_writer; |
auto module_list_writer = make_scoped_ptr(new MinidumpModuleListWriter()); |
- minidump_file_writer.AddStream(crashpad::move(module_list_writer)); |
+ minidump_file_writer.AddStream(std::move(module_list_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -277,8 +278,8 @@ TEST(MinidumpModuleWriter, EmptyModule) { |
auto module_writer = make_scoped_ptr(new MinidumpModuleWriter()); |
module_writer->SetName(kModuleName); |
- module_list_writer->AddModule(crashpad::move(module_writer)); |
- minidump_file_writer.AddStream(crashpad::move(module_list_writer)); |
+ module_list_writer->AddModule(std::move(module_writer)); |
+ minidump_file_writer.AddStream(std::move(module_list_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -360,16 +361,16 @@ TEST(MinidumpModuleWriter, OneModule) { |
make_scoped_ptr(new MinidumpModuleCodeViewRecordPDB70Writer()); |
codeview_pdb70_writer->SetPDBName(kPDBName); |
codeview_pdb70_writer->SetUUIDAndAge(pdb_uuid, kPDBAge); |
- module_writer->SetCodeViewRecord(crashpad::move(codeview_pdb70_writer)); |
+ module_writer->SetCodeViewRecord(std::move(codeview_pdb70_writer)); |
auto misc_debug_writer = |
make_scoped_ptr(new MinidumpModuleMiscDebugRecordWriter()); |
misc_debug_writer->SetDataType(kDebugType); |
misc_debug_writer->SetData(kDebugName, kDebugUTF16); |
- module_writer->SetMiscDebugRecord(crashpad::move(misc_debug_writer)); |
+ module_writer->SetMiscDebugRecord(std::move(misc_debug_writer)); |
- module_list_writer->AddModule(crashpad::move(module_writer)); |
- minidump_file_writer.AddStream(crashpad::move(module_list_writer)); |
+ module_list_writer->AddModule(std::move(module_writer)); |
+ minidump_file_writer.AddStream(std::move(module_list_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -435,16 +436,16 @@ TEST(MinidumpModuleWriter, OneModule_CodeViewUsesPDB20_MiscUsesUTF16) { |
make_scoped_ptr(new MinidumpModuleCodeViewRecordPDB20Writer()); |
codeview_pdb20_writer->SetPDBName(kPDBName); |
codeview_pdb20_writer->SetTimestampAndAge(kPDBTimestamp, kPDBAge); |
- module_writer->SetCodeViewRecord(crashpad::move(codeview_pdb20_writer)); |
+ module_writer->SetCodeViewRecord(std::move(codeview_pdb20_writer)); |
auto misc_debug_writer = |
make_scoped_ptr(new MinidumpModuleMiscDebugRecordWriter()); |
misc_debug_writer->SetDataType(kDebugType); |
misc_debug_writer->SetData(kDebugName, kDebugUTF16); |
- module_writer->SetMiscDebugRecord(crashpad::move(misc_debug_writer)); |
+ module_writer->SetMiscDebugRecord(std::move(misc_debug_writer)); |
- module_list_writer->AddModule(crashpad::move(module_writer)); |
- minidump_file_writer.AddStream(crashpad::move(module_list_writer)); |
+ module_list_writer->AddModule(std::move(module_writer)); |
+ minidump_file_writer.AddStream(std::move(module_list_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -512,16 +513,16 @@ TEST(MinidumpModuleWriter, ThreeModules) { |
make_scoped_ptr(new MinidumpModuleCodeViewRecordPDB70Writer()); |
codeview_pdb70_writer_0->SetPDBName(kPDBName0); |
codeview_pdb70_writer_0->SetUUIDAndAge(pdb_uuid_0, kPDBAge0); |
- module_writer_0->SetCodeViewRecord(crashpad::move(codeview_pdb70_writer_0)); |
+ module_writer_0->SetCodeViewRecord(std::move(codeview_pdb70_writer_0)); |
- module_list_writer->AddModule(crashpad::move(module_writer_0)); |
+ module_list_writer->AddModule(std::move(module_writer_0)); |
auto module_writer_1 = make_scoped_ptr(new MinidumpModuleWriter()); |
module_writer_1->SetName(kModuleName1); |
module_writer_1->SetImageBaseAddress(kModuleBase1); |
module_writer_1->SetImageSize(kModuleSize1); |
- module_list_writer->AddModule(crashpad::move(module_writer_1)); |
+ module_list_writer->AddModule(std::move(module_writer_1)); |
auto module_writer_2 = make_scoped_ptr(new MinidumpModuleWriter()); |
module_writer_2->SetName(kModuleName2); |
@@ -532,11 +533,11 @@ TEST(MinidumpModuleWriter, ThreeModules) { |
make_scoped_ptr(new MinidumpModuleCodeViewRecordPDB20Writer()); |
codeview_pdb70_writer_2->SetPDBName(kPDBName2); |
codeview_pdb70_writer_2->SetTimestampAndAge(kPDBTimestamp2, kPDBAge2); |
- module_writer_2->SetCodeViewRecord(crashpad::move(codeview_pdb70_writer_2)); |
+ module_writer_2->SetCodeViewRecord(std::move(codeview_pdb70_writer_2)); |
- module_list_writer->AddModule(crashpad::move(module_writer_2)); |
+ module_list_writer->AddModule(std::move(module_writer_2)); |
- minidump_file_writer.AddStream(crashpad::move(module_list_writer)); |
+ minidump_file_writer.AddStream(std::move(module_list_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -729,7 +730,7 @@ TEST(MinidumpModuleWriter, InitializeFromSnapshot) { |
module_list_writer->InitializeFromSnapshot(module_snapshots); |
MinidumpFileWriter minidump_file_writer; |
- minidump_file_writer.AddStream(crashpad::move(module_list_writer)); |
+ minidump_file_writer.AddStream(std::move(module_list_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -760,8 +761,8 @@ TEST(MinidumpModuleWriterDeathTest, NoModuleName) { |
MinidumpFileWriter minidump_file_writer; |
auto module_list_writer = make_scoped_ptr(new MinidumpModuleListWriter()); |
auto module_writer = make_scoped_ptr(new MinidumpModuleWriter()); |
- module_list_writer->AddModule(crashpad::move(module_writer)); |
- minidump_file_writer.AddStream(crashpad::move(module_list_writer)); |
+ module_list_writer->AddModule(std::move(module_writer)); |
+ minidump_file_writer.AddStream(std::move(module_list_writer)); |
StringFile string_file; |
ASSERT_DEATH_CHECK(minidump_file_writer.WriteEverything(&string_file), |