| Index: third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer_test.cc
|
| diff --git a/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer_test.cc b/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer_test.cc
|
| index bbfbdfca4b31f3fe0b4b80d86f539283cdc00b0f..d5ff65ceb6979d7a5d81eb0ba48a60f3e6c3a5af 100644
|
| --- a/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer_test.cc
|
| +++ b/third_party/crashpad/crashpad/minidump/minidump_crashpad_info_writer_test.cc
|
| @@ -19,6 +19,7 @@
|
|
|
| #include <map>
|
| #include <string>
|
| +#include <utility>
|
|
|
| #include "gtest/gtest.h"
|
| #include "minidump/minidump_extensions.h"
|
| @@ -31,7 +32,6 @@
|
| #include "snapshot/test/test_module_snapshot.h"
|
| #include "snapshot/test/test_process_snapshot.h"
|
| #include "util/file/string_file.h"
|
| -#include "util/stdlib/move.h"
|
|
|
| namespace crashpad {
|
| namespace test {
|
| @@ -68,7 +68,7 @@ TEST(MinidumpCrashpadInfoWriter, Empty) {
|
| auto crashpad_info_writer = make_scoped_ptr(new MinidumpCrashpadInfoWriter());
|
| EXPECT_FALSE(crashpad_info_writer->IsUseful());
|
|
|
| - minidump_file_writer.AddStream(crashpad::move(crashpad_info_writer));
|
| + minidump_file_writer.AddStream(std::move(crashpad_info_writer));
|
|
|
| StringFile string_file;
|
| ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
|
| @@ -103,7 +103,7 @@ TEST(MinidumpCrashpadInfoWriter, ReportAndClientID) {
|
|
|
| EXPECT_TRUE(crashpad_info_writer->IsUseful());
|
|
|
| - minidump_file_writer.AddStream(crashpad::move(crashpad_info_writer));
|
| + minidump_file_writer.AddStream(std::move(crashpad_info_writer));
|
|
|
| StringFile string_file;
|
| ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
|
| @@ -138,13 +138,13 @@ TEST(MinidumpCrashpadInfoWriter, SimpleAnnotations) {
|
| 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));
|
| crashpad_info_writer->SetSimpleAnnotations(
|
| - crashpad::move(simple_string_dictionary_writer));
|
| + std::move(simple_string_dictionary_writer));
|
|
|
| EXPECT_TRUE(crashpad_info_writer->IsUseful());
|
|
|
| - minidump_file_writer.AddStream(crashpad::move(crashpad_info_writer));
|
| + minidump_file_writer.AddStream(std::move(crashpad_info_writer));
|
|
|
| StringFile string_file;
|
| ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
|
| @@ -178,12 +178,13 @@ TEST(MinidumpCrashpadInfoWriter, CrashpadModuleList) {
|
| auto module_list_writer =
|
| make_scoped_ptr(new MinidumpModuleCrashpadInfoListWriter());
|
| auto module_writer = make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter());
|
| - module_list_writer->AddModule(crashpad::move(module_writer), kMinidumpModuleListIndex);
|
| - crashpad_info_writer->SetModuleList(crashpad::move(module_list_writer));
|
| + module_list_writer->AddModule(std::move(module_writer),
|
| + kMinidumpModuleListIndex);
|
| + crashpad_info_writer->SetModuleList(std::move(module_list_writer));
|
|
|
| EXPECT_TRUE(crashpad_info_writer->IsUseful());
|
|
|
| - minidump_file_writer.AddStream(crashpad::move(crashpad_info_writer));
|
| + minidump_file_writer.AddStream(std::move(crashpad_info_writer));
|
|
|
| StringFile string_file;
|
| ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
|
| @@ -233,7 +234,7 @@ TEST(MinidumpCrashpadInfoWriter, InitializeFromSnapshot) {
|
| auto process_snapshot = make_scoped_ptr(new TestProcessSnapshot());
|
|
|
| auto module_snapshot = make_scoped_ptr(new TestModuleSnapshot());
|
| - process_snapshot->AddModule(crashpad::move(module_snapshot));
|
| + process_snapshot->AddModule(std::move(module_snapshot));
|
|
|
| auto info_writer = make_scoped_ptr(new MinidumpCrashpadInfoWriter());
|
| info_writer->InitializeFromSnapshot(process_snapshot.get());
|
| @@ -252,14 +253,14 @@ TEST(MinidumpCrashpadInfoWriter, InitializeFromSnapshot) {
|
| module_snapshot.reset(new TestModuleSnapshot());
|
| std::vector<std::string> annotations_list(1, std::string(kEntry));
|
| module_snapshot->SetAnnotationsVector(annotations_list);
|
| - process_snapshot->AddModule(crashpad::move(module_snapshot));
|
| + process_snapshot->AddModule(std::move(module_snapshot));
|
|
|
| info_writer.reset(new MinidumpCrashpadInfoWriter());
|
| info_writer->InitializeFromSnapshot(process_snapshot.get());
|
| EXPECT_TRUE(info_writer->IsUseful());
|
|
|
| MinidumpFileWriter minidump_file_writer;
|
| - minidump_file_writer.AddStream(crashpad::move(info_writer));
|
| + minidump_file_writer.AddStream(std::move(info_writer));
|
|
|
| StringFile string_file;
|
| ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
|
|
|