Index: minidump/minidump_simple_string_dictionary_writer_test.cc |
diff --git a/minidump/minidump_simple_string_dictionary_writer_test.cc b/minidump/minidump_simple_string_dictionary_writer_test.cc |
index a8c8d02de6194197ad1402c6c187b3438ae3a081..1e401d4572d4e62759e26b603a6490b2bd9b3583 100644 |
--- a/minidump/minidump_simple_string_dictionary_writer_test.cc |
+++ b/minidump/minidump_simple_string_dictionary_writer_test.cc |
@@ -16,13 +16,13 @@ |
#include <map> |
#include <string> |
+#include <utility> |
#include "gtest/gtest.h" |
#include "minidump/minidump_extensions.h" |
#include "minidump/test/minidump_string_writer_test_util.h" |
#include "minidump/test/minidump_writable_test_util.h" |
#include "util/file/string_file.h" |
-#include "util/stdlib/move.h" |
namespace crashpad { |
namespace test { |
@@ -63,7 +63,7 @@ TEST(MinidumpSimpleStringDictionaryWriter, EmptyKeyValue) { |
MinidumpSimpleStringDictionaryWriter dictionary_writer; |
auto entry_writer = |
make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter()); |
- dictionary_writer.AddEntry(crashpad::move(entry_writer)); |
+ dictionary_writer.AddEntry(std::move(entry_writer)); |
EXPECT_TRUE(dictionary_writer.IsUseful()); |
@@ -97,7 +97,7 @@ TEST(MinidumpSimpleStringDictionaryWriter, OneKeyValue) { |
auto entry_writer = |
make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter()); |
entry_writer->SetKeyValue(kKey, kValue); |
- dictionary_writer.AddEntry(crashpad::move(entry_writer)); |
+ dictionary_writer.AddEntry(std::move(entry_writer)); |
EXPECT_TRUE(dictionary_writer.IsUseful()); |
@@ -135,15 +135,15 @@ TEST(MinidumpSimpleStringDictionaryWriter, ThreeKeysValues) { |
auto entry_writer_0 = |
make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter()); |
entry_writer_0->SetKeyValue(kKey0, kValue0); |
- dictionary_writer.AddEntry(crashpad::move(entry_writer_0)); |
+ dictionary_writer.AddEntry(std::move(entry_writer_0)); |
auto entry_writer_1 = |
make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter()); |
entry_writer_1->SetKeyValue(kKey1, kValue1); |
- dictionary_writer.AddEntry(crashpad::move(entry_writer_1)); |
+ dictionary_writer.AddEntry(std::move(entry_writer_1)); |
auto entry_writer_2 = |
make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter()); |
entry_writer_2->SetKeyValue(kKey2, kValue2); |
- dictionary_writer.AddEntry(crashpad::move(entry_writer_2)); |
+ dictionary_writer.AddEntry(std::move(entry_writer_2)); |
EXPECT_TRUE(dictionary_writer.IsUseful()); |
@@ -203,11 +203,11 @@ TEST(MinidumpSimpleStringDictionaryWriter, DuplicateKeyValue) { |
auto entry_writer_0 = |
make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter()); |
entry_writer_0->SetKeyValue(kKey, kValue0); |
- dictionary_writer.AddEntry(crashpad::move(entry_writer_0)); |
+ dictionary_writer.AddEntry(std::move(entry_writer_0)); |
auto entry_writer_1 = |
make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter()); |
entry_writer_1->SetKeyValue(kKey, kValue1); |
- dictionary_writer.AddEntry(crashpad::move(entry_writer_1)); |
+ dictionary_writer.AddEntry(std::move(entry_writer_1)); |
EXPECT_TRUE(dictionary_writer.IsUseful()); |