Index: minidump/minidump_exception_writer_test.cc |
diff --git a/minidump/minidump_exception_writer_test.cc b/minidump/minidump_exception_writer_test.cc |
index 4c6e2677eaf95463f7f8fd4c502c77da5aed52ce..bc3bfec9169edcb1dc95a27ba489becc61ff2a92 100644 |
--- a/minidump/minidump_exception_writer_test.cc |
+++ b/minidump/minidump_exception_writer_test.cc |
@@ -20,6 +20,7 @@ |
#include <sys/types.h> |
#include <string> |
+#include <utility> |
#include <vector> |
#include "gtest/gtest.h" |
@@ -35,7 +36,6 @@ |
#include "snapshot/test/test_exception_snapshot.h" |
#include "test/gtest_death_check.h" |
#include "util/file/string_file.h" |
-#include "util/stdlib/move.h" |
namespace crashpad { |
namespace test { |
@@ -105,9 +105,9 @@ TEST(MinidumpExceptionWriter, Minimal) { |
auto context_x86_writer = make_scoped_ptr(new MinidumpContextX86Writer()); |
InitializeMinidumpContextX86(context_x86_writer->context(), kSeed); |
- exception_writer->SetContext(crashpad::move(context_x86_writer)); |
+ exception_writer->SetContext(std::move(context_x86_writer)); |
- minidump_file_writer.AddStream(crashpad::move(exception_writer)); |
+ minidump_file_writer.AddStream(std::move(exception_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -145,7 +145,7 @@ TEST(MinidumpExceptionWriter, Standard) { |
auto context_x86_writer = make_scoped_ptr(new MinidumpContextX86Writer()); |
InitializeMinidumpContextX86(context_x86_writer->context(), kSeed); |
- exception_writer->SetContext(crashpad::move(context_x86_writer)); |
+ exception_writer->SetContext(std::move(context_x86_writer)); |
exception_writer->SetThreadID(kThreadID); |
exception_writer->SetExceptionCode(kExceptionCode); |
@@ -166,7 +166,7 @@ TEST(MinidumpExceptionWriter, Standard) { |
exception_information.push_back(kExceptionInformation2); |
exception_writer->SetExceptionInformation(exception_information); |
- minidump_file_writer.AddStream(crashpad::move(exception_writer)); |
+ minidump_file_writer.AddStream(std::move(exception_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -239,7 +239,7 @@ TEST(MinidumpExceptionWriter, InitializeFromSnapshot) { |
exception_writer->InitializeFromSnapshot(&exception_snapshot, thread_id_map); |
MinidumpFileWriter minidump_file_writer; |
- minidump_file_writer.AddStream(crashpad::move(exception_writer)); |
+ minidump_file_writer.AddStream(std::move(exception_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -261,7 +261,7 @@ TEST(MinidumpExceptionWriterDeathTest, NoContext) { |
MinidumpFileWriter minidump_file_writer; |
auto exception_writer = make_scoped_ptr(new MinidumpExceptionWriter()); |
- minidump_file_writer.AddStream(crashpad::move(exception_writer)); |
+ minidump_file_writer.AddStream(std::move(exception_writer)); |
StringFile string_file; |
ASSERT_DEATH_CHECK(minidump_file_writer.WriteEverything(&string_file), |