Index: minidump/minidump_module_crashpad_info_writer_test.cc |
diff --git a/minidump/minidump_module_crashpad_info_writer_test.cc b/minidump/minidump_module_crashpad_info_writer_test.cc |
index 79ed26671d4d9f6c98c02705e15ff6d5b7da000d..07f44c14d88d39904dc798ea2cf5ff362859c0f0 100644 |
--- a/minidump/minidump_module_crashpad_info_writer_test.cc |
+++ b/minidump/minidump_module_crashpad_info_writer_test.cc |
@@ -17,6 +17,8 @@ |
#include <windows.h> |
#include <dbghelp.h> |
+#include <utility> |
+ |
#include "gtest/gtest.h" |
#include "minidump/minidump_extensions.h" |
#include "minidump/minidump_simple_string_dictionary_writer.h" |
@@ -25,7 +27,6 @@ |
#include "minidump/test/minidump_writable_test_util.h" |
#include "snapshot/test/test_module_snapshot.h" |
#include "util/file/string_file.h" |
-#include "util/stdlib/move.h" |
namespace crashpad { |
namespace test { |
@@ -78,7 +79,7 @@ TEST(MinidumpModuleCrashpadInfoWriter, EmptyModule) { |
make_scoped_ptr(new MinidumpModuleCrashpadInfoListWriter()); |
auto module_writer = make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter()); |
EXPECT_FALSE(module_writer->IsUseful()); |
- module_list_writer->AddModule(crashpad::move(module_writer), 0); |
+ module_list_writer->AddModule(std::move(module_writer), 0); |
EXPECT_TRUE(module_list_writer->IsUseful()); |
@@ -120,18 +121,18 @@ TEST(MinidumpModuleCrashpadInfoWriter, FullModule) { |
auto module_writer = make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter()); |
auto string_list_writer = make_scoped_ptr(new MinidumpUTF8StringListWriter()); |
string_list_writer->InitializeFromVector(vector); |
- module_writer->SetListAnnotations(crashpad::move(string_list_writer)); |
+ module_writer->SetListAnnotations(std::move(string_list_writer)); |
auto simple_string_dictionary_writer = |
make_scoped_ptr(new MinidumpSimpleStringDictionaryWriter()); |
auto simple_string_dictionary_entry_writer = |
make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter()); |
simple_string_dictionary_entry_writer->SetKeyValue(kKey, kValue); |
simple_string_dictionary_writer->AddEntry( |
- crashpad::move(simple_string_dictionary_entry_writer)); |
+ std::move(simple_string_dictionary_entry_writer)); |
module_writer->SetSimpleAnnotations( |
- crashpad::move(simple_string_dictionary_writer)); |
+ std::move(simple_string_dictionary_writer)); |
EXPECT_TRUE(module_writer->IsUseful()); |
- module_list_writer->AddModule(crashpad::move(module_writer), |
+ module_list_writer->AddModule(std::move(module_writer), |
kMinidumpModuleListIndex); |
EXPECT_TRUE(module_list_writer->IsUseful()); |
@@ -214,17 +215,17 @@ TEST(MinidumpModuleCrashpadInfoWriter, ThreeModules) { |
make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter()); |
simple_string_dictionary_entry_writer_0->SetKeyValue(kKey0, kValue0); |
simple_string_dictionary_writer_0->AddEntry( |
- crashpad::move(simple_string_dictionary_entry_writer_0)); |
+ std::move(simple_string_dictionary_entry_writer_0)); |
module_writer_0->SetSimpleAnnotations( |
- crashpad::move(simple_string_dictionary_writer_0)); |
+ std::move(simple_string_dictionary_writer_0)); |
EXPECT_TRUE(module_writer_0->IsUseful()); |
- module_list_writer->AddModule(crashpad::move(module_writer_0), |
+ module_list_writer->AddModule(std::move(module_writer_0), |
kMinidumpModuleListIndex0); |
auto module_writer_1 = |
make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter()); |
EXPECT_FALSE(module_writer_1->IsUseful()); |
- module_list_writer->AddModule(crashpad::move(module_writer_1), |
+ module_list_writer->AddModule(std::move(module_writer_1), |
kMinidumpModuleListIndex1); |
auto module_writer_2 = |
@@ -235,16 +236,16 @@ TEST(MinidumpModuleCrashpadInfoWriter, ThreeModules) { |
make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter()); |
simple_string_dictionary_entry_writer_2a->SetKeyValue(kKey2A, kValue2A); |
simple_string_dictionary_writer_2->AddEntry( |
- crashpad::move(simple_string_dictionary_entry_writer_2a)); |
+ std::move(simple_string_dictionary_entry_writer_2a)); |
auto simple_string_dictionary_entry_writer_2b = |
make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter()); |
simple_string_dictionary_entry_writer_2b->SetKeyValue(kKey2B, kValue2B); |
simple_string_dictionary_writer_2->AddEntry( |
- crashpad::move(simple_string_dictionary_entry_writer_2b)); |
+ std::move(simple_string_dictionary_entry_writer_2b)); |
module_writer_2->SetSimpleAnnotations( |
- crashpad::move(simple_string_dictionary_writer_2)); |
+ std::move(simple_string_dictionary_writer_2)); |
EXPECT_TRUE(module_writer_2->IsUseful()); |
- module_list_writer->AddModule(crashpad::move(module_writer_2), |
+ module_list_writer->AddModule(std::move(module_writer_2), |
kMinidumpModuleListIndex2); |
EXPECT_TRUE(module_list_writer->IsUseful()); |