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

minidump/minidump_system_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_system_info_writer.h"
 
 #include <windows.h>
 #include <dbghelp.h>
 #include <string.h>
 #include <sys/types.h>
 
 #include <algorithm>
 #include <string>
+#include <utility>
 
 #include "base/compiler_specific.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_file_writer.h"
 #include "minidump/test/minidump_file_writer_test_util.h"
 #include "minidump/test/minidump_string_writer_test_util.h"
 #include "minidump/test/minidump_writable_test_util.h"
 #include "snapshot/test/test_system_snapshot.h"
 #include "test/gtest_death_check.h"
 #include "util/file/string_file.h"
-#include "util/stdlib/move.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 void GetSystemInfoStream(const std::string& file_contents,
                          size_t csd_version_length,
                          const MINIDUMP_SYSTEM_INFO** system_info,
                          const MINIDUMP_STRING** csd_version) {
   // The expected number of bytes for the CSD version’s MINIDUMP_STRING::Buffer.
@@ skipping 32 matching lines @@
       MinidumpStringAtRVA(file_contents, (*system_info)->CSDVersionRva);
   EXPECT_EQ(kCSDVersionBytes, (*csd_version)->Length);
 }
 
 TEST(MinidumpSystemInfoWriter, Empty) {
   MinidumpFileWriter minidump_file_writer;
   auto system_info_writer = make_scoped_ptr(new MinidumpSystemInfoWriter());
 
   system_info_writer->SetCSDVersion(std::string());
 
-  minidump_file_writer.AddStream(crashpad::move(system_info_writer));
+  minidump_file_writer.AddStream(std::move(system_info_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
   const MINIDUMP_STRING* csd_version = nullptr;
 
   ASSERT_NO_FATAL_FAILURE(
       GetSystemInfoStream(string_file.string(), 0, &system_info, &csd_version));
 
@@ skipping 50 matching lines @@
   system_info_writer->SetOS(kOS);
   system_info_writer->SetOSType(kMinidumpOSTypeWorkstation);
   system_info_writer->SetOSVersion(
       kOSVersionMajor, kOSVersionMinor, kOSVersionBuild);
   system_info_writer->SetCSDVersion(kCSDVersion);
   system_info_writer->SetSuiteMask(kSuiteMask);
   system_info_writer->SetCPUX86VendorString(kCPUVendor);
   system_info_writer->SetCPUX86VersionAndFeatures(kCPUVersion, kCPUFeatures);
   system_info_writer->SetCPUX86AMDExtendedFeatures(kAMDFeatures);
 
-  minidump_file_writer.AddStream(crashpad::move(system_info_writer));
+  minidump_file_writer.AddStream(std::move(system_info_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
   const MINIDUMP_STRING* csd_version = nullptr;
 
   ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(
       string_file.string(), strlen(kCSDVersion), &system_info, &csd_version));
 
@@ skipping 39 matching lines @@
   system_info_writer->SetCPUArchitecture(kCPUArchitecture);
   system_info_writer->SetCPULevelAndRevision(kCPULevel, kCPURevision);
   system_info_writer->SetCPUCount(kCPUCount);
   system_info_writer->SetOS(kOS);
   system_info_writer->SetOSType(kMinidumpOSTypeWorkstation);
   system_info_writer->SetOSVersion(
       kOSVersionMajor, kOSVersionMinor, kOSVersionBuild);
   system_info_writer->SetCSDVersion(kCSDVersion);
   system_info_writer->SetCPUOtherFeatures(kCPUFeatures[0], kCPUFeatures[1]);
 
-  minidump_file_writer.AddStream(crashpad::move(system_info_writer));
+  minidump_file_writer.AddStream(std::move(system_info_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
   const MINIDUMP_STRING* csd_version;
 
   ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(
       string_file.string(), strlen(kCSDVersion), &system_info, &csd_version));
 
@@ skipping 21 matching lines @@
   auto system_info_writer = make_scoped_ptr(new MinidumpSystemInfoWriter());
 
   const MinidumpCPUArchitecture kCPUArchitecture = kMinidumpCPUArchitectureX86;
   const uint32_t kCPUVendor[] = {'uneG', 'Ieni', 'letn'};
 
   system_info_writer->SetCPUArchitecture(kCPUArchitecture);
   system_info_writer->SetCPUX86Vendor(
       kCPUVendor[0], kCPUVendor[1], kCPUVendor[2]);
   system_info_writer->SetCSDVersion(std::string());
 
-  minidump_file_writer.AddStream(crashpad::move(system_info_writer));
+  minidump_file_writer.AddStream(std::move(system_info_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
   const MINIDUMP_STRING* csd_version;
 
   ASSERT_NO_FATAL_FAILURE(
       GetSystemInfoStream(string_file.string(), 0, &system_info, &csd_version));
 
@@ skipping 59 matching lines @@
   system_snapshot.SetOSServer(true);
   system_snapshot.SetOSVersion(expect_system_info.MajorVersion,
                                expect_system_info.MinorVersion,
                                expect_system_info.BuildNumber,
                                kOSVersionBuild);
 
   auto system_info_writer = make_scoped_ptr(new MinidumpSystemInfoWriter());
   system_info_writer->InitializeFromSnapshot(&system_snapshot);
 
   MinidumpFileWriter minidump_file_writer;
-  minidump_file_writer.AddStream(crashpad::move(system_info_writer));
+  minidump_file_writer.AddStream(std::move(system_info_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
   const MINIDUMP_STRING* csd_version = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(string_file.string(),
                                               strlen(kOSVersionBuild),
                                               &system_info,
                                               &csd_version));
@@ skipping 74 matching lines @@
   system_snapshot.SetOSVersion(expect_system_info.MajorVersion,
                                expect_system_info.MinorVersion,
                                expect_system_info.BuildNumber,
                                kOSVersionBuild);
   system_snapshot.SetNXEnabled(true);
 
   auto system_info_writer = make_scoped_ptr(new MinidumpSystemInfoWriter());
   system_info_writer->InitializeFromSnapshot(&system_snapshot);
 
   MinidumpFileWriter minidump_file_writer;
-  minidump_file_writer.AddStream(crashpad::move(system_info_writer));
+  minidump_file_writer.AddStream(std::move(system_info_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_SYSTEM_INFO* system_info = nullptr;
   const MINIDUMP_STRING* csd_version = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetSystemInfoStream(string_file.string(),
                                               strlen(kOSVersionBuild),
                                               &system_info,
                                               &csd_version));
@@ skipping 17 matching lines @@
             system_info->Cpu.OtherCpuInfo.ProcessorFeatures[1]);
 
   for (size_t index = 0; index < strlen(kOSVersionBuild); ++index) {
     EXPECT_EQ(kOSVersionBuild[index], csd_version->Buffer[index]) << index;
   }
 }
 
 TEST(MinidumpSystemInfoWriterDeathTest, NoCSDVersion) {
   MinidumpFileWriter minidump_file_writer;
   auto system_info_writer = make_scoped_ptr(new MinidumpSystemInfoWriter());
-  minidump_file_writer.AddStream(crashpad::move(system_info_writer));
+  minidump_file_writer.AddStream(std::move(system_info_writer));
 
   StringFile string_file;
   ASSERT_DEATH_CHECK(minidump_file_writer.WriteEverything(&string_file),
                      "csd_version_");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad