Provide std::move() in compat instead of using crashpad::move()

minidump/minidump_misc_info_writer_test.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "minidump/minidump_misc_info_writer.h"
 
 #include <windows.h>
 #include <dbghelp.h>
 #include <string.h>
 
 #include <string>
+#include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_file_writer.h"
 #include "minidump/test/minidump_file_writer_test_util.h"
 #include "minidump/test/minidump_writable_test_util.h"
 #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 {
 namespace test {
 namespace {
 
 template <typename T>
 void GetMiscInfoStream(const std::string& file_contents, const T** misc_info) {
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
   const size_t kMiscInfoStreamOffset =
@@ skipping 116 matching lines @@
     ExpectNULPaddedString16Equal(expected->DbgBldStr,
                                  observed->DbgBldStr,
                                  arraysize(expected->DbgBldStr));
   }
 }
 
 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));
 
   const MINIDUMP_MISC_INFO* observed = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(string_file.string(), &observed));
 
   MINIDUMP_MISC_INFO expected = {};
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
 TEST(MinidumpMiscInfoWriter, ProcessId) {
   MinidumpFileWriter minidump_file_writer;
   auto misc_info_writer = make_scoped_ptr(new MinidumpMiscInfoWriter());
 
   const uint32_t kProcessId = 12345;
 
   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));
 
   const MINIDUMP_MISC_INFO* observed = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(string_file.string(), &observed));
 
   MINIDUMP_MISC_INFO expected = {};
   expected.Flags1 = MINIDUMP_MISC1_PROCESS_ID;
   expected.ProcessId = kProcessId;
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
 TEST(MinidumpMiscInfoWriter, ProcessTimes) {
   MinidumpFileWriter minidump_file_writer;
   auto misc_info_writer = make_scoped_ptr(new MinidumpMiscInfoWriter());
 
   const time_t kProcessCreateTime = 0x15252f00;
   const uint32_t kProcessUserTime = 10;
   const uint32_t kProcessKernelTime = 5;
 
   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));
 
   const MINIDUMP_MISC_INFO* observed = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(string_file.string(), &observed));
 
   MINIDUMP_MISC_INFO expected = {};
   expected.Flags1 = MINIDUMP_MISC1_PROCESS_TIMES;
   expected.ProcessCreateTime = kProcessCreateTime;
@@ skipping 12 matching lines @@
   const uint32_t kProcessorMhzLimit = 3300;
   const uint32_t kProcessorMaxIdleState = 5;
   const uint32_t kProcessorCurrentIdleState = 1;
 
   misc_info_writer->SetProcessorPowerInfo(kProcessorMaxMhz,
                                           kProcessorCurrentMhz,
                                           kProcessorMhzLimit,
                                           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));
 
   const MINIDUMP_MISC_INFO_2* observed = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(string_file.string(), &observed));
 
   MINIDUMP_MISC_INFO_2 expected = {};
   expected.Flags1 = MINIDUMP_MISC1_PROCESSOR_POWER_INFO;
   expected.ProcessorMaxMhz = kProcessorMaxMhz;
   expected.ProcessorCurrentMhz = kProcessorCurrentMhz;
   expected.ProcessorMhzLimit = kProcessorMhzLimit;
   expected.ProcessorMaxIdleState = kProcessorMaxIdleState;
   expected.ProcessorCurrentIdleState = kProcessorCurrentIdleState;
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
 TEST(MinidumpMiscInfoWriter, ProcessIntegrityLevel) {
   MinidumpFileWriter minidump_file_writer;
   auto misc_info_writer = make_scoped_ptr(new MinidumpMiscInfoWriter());
 
   const uint32_t kProcessIntegrityLevel = 0x2000;
 
   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));
 
   const MINIDUMP_MISC_INFO_3* observed = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(string_file.string(), &observed));
 
   MINIDUMP_MISC_INFO_3 expected = {};
   expected.Flags1 = MINIDUMP_MISC3_PROCESS_INTEGRITY;
   expected.ProcessIntegrityLevel = kProcessIntegrityLevel;
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
 TEST(MinidumpMiscInfoWriter, ProcessExecuteFlags) {
   MinidumpFileWriter minidump_file_writer;
   auto misc_info_writer = make_scoped_ptr(new MinidumpMiscInfoWriter());
 
   const uint32_t kProcessExecuteFlags = 0x13579bdf;
 
   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));
 
   const MINIDUMP_MISC_INFO_3* observed = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(string_file.string(), &observed));
 
   MINIDUMP_MISC_INFO_3 expected = {};
   expected.Flags1 = MINIDUMP_MISC3_PROCESS_EXECUTE_FLAGS;
   expected.ProcessExecuteFlags = kProcessExecuteFlags;
 
   ExpectMiscInfoEqual(&expected, observed);
 }
 
 TEST(MinidumpMiscInfoWriter, ProtectedProcess) {
   MinidumpFileWriter minidump_file_writer;
   auto misc_info_writer = make_scoped_ptr(new MinidumpMiscInfoWriter());
 
   const uint32_t kProtectedProcess = 1;
 
   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));
 
   const MINIDUMP_MISC_INFO_3* observed = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(string_file.string(), &observed));
 
   MINIDUMP_MISC_INFO_3 expected = {};
   expected.Flags1 = MINIDUMP_MISC3_PROTECTED_PROCESS;
   expected.ProtectedProcess = kProtectedProcess;
@@ skipping 16 matching lines @@
 
   misc_info_writer->SetTimeZone(kTimeZoneId,
                                 kBias,
                                 kStandardName,
                                 kStandardDate,
                                 kStandardBias,
                                 kDaylightName,
                                 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));
 
   const MINIDUMP_MISC_INFO_3* observed = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(string_file.string(), &observed));
 
   MINIDUMP_MISC_INFO_3 expected = {};
   expected.Flags1 = MINIDUMP_MISC3_TIMEZONE;
   expected.TimeZoneId = kTimeZoneId;
@@ skipping 40 matching lines @@
 
   misc_info_writer->SetTimeZone(kTimeZoneId,
                                 kBias,
                                 standard_name,
                                 kSystemTimeZero,
                                 kStandardBias,
                                 daylight_name,
                                 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));
 
   const MINIDUMP_MISC_INFO_3* observed = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(string_file.string(), &observed));
 
   MINIDUMP_MISC_INFO_3 expected = {};
   expected.Flags1 = MINIDUMP_MISC3_TIMEZONE;
   expected.TimeZoneId = kTimeZoneId;
@@ skipping 20 matching lines @@
 
 TEST(MinidumpMiscInfoWriter, BuildStrings) {
   MinidumpFileWriter minidump_file_writer;
   auto misc_info_writer = make_scoped_ptr(new MinidumpMiscInfoWriter());
 
   const char kBuildString[] = "build string";
   const char kDebugBuildString[] = "debug build string";
 
   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));
 
   const MINIDUMP_MISC_INFO_4* observed = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(string_file.string(), &observed));
 
   MINIDUMP_MISC_INFO_4 expected = {};
   expected.Flags1 = MINIDUMP_MISC4_BUILDSTRING;
   base::string16 build_string_utf16 = base::UTF8ToUTF16(kBuildString);
@@ skipping 16 matching lines @@
   MinidumpFileWriter minidump_file_writer;
   auto misc_info_writer = make_scoped_ptr(new MinidumpMiscInfoWriter());
 
   MINIDUMP_MISC_INFO_4 tmp;
   ALLOW_UNUSED_LOCAL(tmp);
   std::string build_string(arraysize(tmp.BuildString) + 1, 'B');
   std::string debug_build_string(arraysize(tmp.DbgBldStr), 'D');
 
   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));
 
   const MINIDUMP_MISC_INFO_4* observed = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(string_file.string(), &observed));
 
   MINIDUMP_MISC_INFO_4 expected = {};
   expected.Flags1 = MINIDUMP_MISC4_BUILDSTRING;
   base::string16 build_string_utf16 = base::UTF8ToUTF16(build_string);
@@ skipping 49 matching lines @@
   misc_info_writer->SetTimeZone(kTimeZoneId,
                                 kBias,
                                 kStandardName,
                                 kSystemTimeZero,
                                 kStandardBias,
                                 kDaylightName,
                                 kSystemTimeZero,
                                 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));
 
   const MINIDUMP_MISC_INFO_4* observed = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(string_file.string(), &observed));
 
   MINIDUMP_MISC_INFO_4 expected = {};
   expected.Flags1 =
       MINIDUMP_MISC1_PROCESS_ID | MINIDUMP_MISC1_PROCESS_TIMES |
@@ skipping 113 matching lines @@
       expect_misc_info.ProcessorMaxMhz * kHzPerMHz);
   system_snapshot->SetTimeZone(SystemSnapshot::kObservingStandardTime,
                                expect_misc_info.TimeZone.Bias * -60,
                                (expect_misc_info.TimeZone.Bias +
                                 expect_misc_info.TimeZone.DaylightBias) * -60,
                                kStandardTimeName,
                                kDaylightTimeName);
   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));
 
   const MINIDUMP_MISC_INFO_4* misc_info = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetMiscInfoStream(string_file.string(), &misc_info));
 
   ExpectMiscInfoEqual(&expect_misc_info, misc_info);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad