Index: minidump/minidump_misc_info_writer_test.cc |
diff --git a/minidump/minidump_misc_info_writer_test.cc b/minidump/minidump_misc_info_writer_test.cc |
index 64825ad51f625dc9429b9dc3089377ff26ad9c09..de8cde3bfb23b1c944a1562a22c783fff1fd12e3 100644 |
--- a/minidump/minidump_misc_info_writer_test.cc |
+++ b/minidump/minidump_misc_info_writer_test.cc |
@@ -19,6 +19,7 @@ |
#include <string.h> |
#include <string> |
+#include <utility> |
#include "base/basictypes.h" |
#include "base/compiler_specific.h" |
@@ -32,7 +33,6 @@ |
#include "snapshot/test/test_process_snapshot.h" |
#include "snapshot/test/test_system_snapshot.h" |
#include "util/file/string_file.h" |
-#include "util/stdlib/move.h" |
#include "util/stdlib/strlcpy.h" |
namespace crashpad { |
@@ -169,7 +169,7 @@ TEST(MinidumpMiscInfoWriter, Empty) { |
MinidumpFileWriter minidump_file_writer; |
auto misc_info_writer = make_scoped_ptr(new MinidumpMiscInfoWriter()); |
- minidump_file_writer.AddStream(crashpad::move(misc_info_writer)); |
+ minidump_file_writer.AddStream(std::move(misc_info_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -190,7 +190,7 @@ TEST(MinidumpMiscInfoWriter, ProcessId) { |
misc_info_writer->SetProcessID(kProcessId); |
- minidump_file_writer.AddStream(crashpad::move(misc_info_writer)); |
+ minidump_file_writer.AddStream(std::move(misc_info_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -216,7 +216,7 @@ TEST(MinidumpMiscInfoWriter, ProcessTimes) { |
misc_info_writer->SetProcessTimes( |
kProcessCreateTime, kProcessUserTime, kProcessKernelTime); |
- minidump_file_writer.AddStream(crashpad::move(misc_info_writer)); |
+ minidump_file_writer.AddStream(std::move(misc_info_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -249,7 +249,7 @@ TEST(MinidumpMiscInfoWriter, ProcessorPowerInfo) { |
kProcessorMaxIdleState, |
kProcessorCurrentIdleState); |
- minidump_file_writer.AddStream(crashpad::move(misc_info_writer)); |
+ minidump_file_writer.AddStream(std::move(misc_info_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -276,7 +276,7 @@ TEST(MinidumpMiscInfoWriter, ProcessIntegrityLevel) { |
misc_info_writer->SetProcessIntegrityLevel(kProcessIntegrityLevel); |
- minidump_file_writer.AddStream(crashpad::move(misc_info_writer)); |
+ minidump_file_writer.AddStream(std::move(misc_info_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -299,7 +299,7 @@ TEST(MinidumpMiscInfoWriter, ProcessExecuteFlags) { |
misc_info_writer->SetProcessExecuteFlags(kProcessExecuteFlags); |
- minidump_file_writer.AddStream(crashpad::move(misc_info_writer)); |
+ minidump_file_writer.AddStream(std::move(misc_info_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -322,7 +322,7 @@ TEST(MinidumpMiscInfoWriter, ProtectedProcess) { |
misc_info_writer->SetProtectedProcess(kProtectedProcess); |
- minidump_file_writer.AddStream(crashpad::move(misc_info_writer)); |
+ minidump_file_writer.AddStream(std::move(misc_info_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -359,7 +359,7 @@ TEST(MinidumpMiscInfoWriter, TimeZone) { |
kDaylightDate, |
kDaylightBias); |
- minidump_file_writer.AddStream(crashpad::move(misc_info_writer)); |
+ minidump_file_writer.AddStream(std::move(misc_info_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -420,7 +420,7 @@ TEST(MinidumpMiscInfoWriter, TimeZoneStringsOverflow) { |
kSystemTimeZero, |
kDaylightBias); |
- minidump_file_writer.AddStream(crashpad::move(misc_info_writer)); |
+ minidump_file_writer.AddStream(std::move(misc_info_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -461,7 +461,7 @@ TEST(MinidumpMiscInfoWriter, BuildStrings) { |
misc_info_writer->SetBuildString(kBuildString, kDebugBuildString); |
- minidump_file_writer.AddStream(crashpad::move(misc_info_writer)); |
+ minidump_file_writer.AddStream(std::move(misc_info_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -498,7 +498,7 @@ TEST(MinidumpMiscInfoWriter, BuildStringsOverflow) { |
misc_info_writer->SetBuildString(build_string, debug_build_string); |
- minidump_file_writer.AddStream(crashpad::move(misc_info_writer)); |
+ minidump_file_writer.AddStream(std::move(misc_info_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -568,7 +568,7 @@ TEST(MinidumpMiscInfoWriter, Everything) { |
kDaylightBias); |
misc_info_writer->SetBuildString(kBuildString, kDebugBuildString); |
- minidump_file_writer.AddStream(crashpad::move(misc_info_writer)); |
+ minidump_file_writer.AddStream(std::move(misc_info_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |
@@ -702,13 +702,13 @@ TEST(MinidumpMiscInfoWriter, InitializeFromSnapshot) { |
system_snapshot->SetOSVersionFull(kOSVersionFull); |
system_snapshot->SetMachineDescription(kMachineDescription); |
- process_snapshot.SetSystem(crashpad::move(system_snapshot)); |
+ process_snapshot.SetSystem(std::move(system_snapshot)); |
auto misc_info_writer = make_scoped_ptr(new MinidumpMiscInfoWriter()); |
misc_info_writer->InitializeFromSnapshot(&process_snapshot); |
MinidumpFileWriter minidump_file_writer; |
- minidump_file_writer.AddStream(crashpad::move(misc_info_writer)); |
+ minidump_file_writer.AddStream(std::move(misc_info_writer)); |
StringFile string_file; |
ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file)); |