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

minidump/minidump_file_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_file_writer.h"
 
 #include <windows.h>
 #include <dbghelp.h>
 
 #include <string>
+#include <utility>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "gtest/gtest.h"
 #include "minidump/minidump_stream_writer.h"
 #include "minidump/minidump_writable.h"
 #include "minidump/test/minidump_file_writer_test_util.h"
 #include "minidump/test/minidump_writable_test_util.h"
 #include "snapshot/test/test_cpu_context.h"
 #include "snapshot/test/test_exception_snapshot.h"
 #include "snapshot/test/test_memory_snapshot.h"
 #include "snapshot/test/test_module_snapshot.h"
 #include "snapshot/test/test_process_snapshot.h"
 #include "snapshot/test/test_system_snapshot.h"
 #include "snapshot/test/test_thread_snapshot.h"
 #include "test/gtest_death_check.h"
 #include "util/file/string_file.h"
-#include "util/stdlib/move.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 TEST(MinidumpFileWriter, Empty) {
   MinidumpFileWriter minidump_file;
   StringFile string_file;
   ASSERT_TRUE(minidump_file.WriteEverything(&string_file));
   ASSERT_EQ(sizeof(MINIDUMP_HEADER), string_file.string().size());
@@ skipping 41 matching lines @@
 TEST(MinidumpFileWriter, OneStream) {
   MinidumpFileWriter minidump_file;
   const time_t kTimestamp = 0x155d2fb8;
   minidump_file.SetTimestamp(kTimestamp);
 
   const size_t kStreamSize = 5;
   const MinidumpStreamType kStreamType = static_cast<MinidumpStreamType>(0x4d);
   const uint8_t kStreamValue = 0x5a;
   auto stream =
       make_scoped_ptr(new TestStream(kStreamType, kStreamSize, kStreamValue));
-  minidump_file.AddStream(crashpad::move(stream));
+  minidump_file.AddStream(std::move(stream));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file.WriteEverything(&string_file));
 
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
   const size_t kStreamOffset = kDirectoryOffset + sizeof(MINIDUMP_DIRECTORY);
   const size_t kFileSize = kStreamOffset + kStreamSize;
 
   ASSERT_EQ(kFileSize, string_file.string().size());
 
@@ skipping 18 matching lines @@
 TEST(MinidumpFileWriter, ThreeStreams) {
   MinidumpFileWriter minidump_file;
   const time_t kTimestamp = 0x155d2fb8;
   minidump_file.SetTimestamp(kTimestamp);
 
   const size_t kStream0Size = 5;
   const MinidumpStreamType kStream0Type = static_cast<MinidumpStreamType>(0x6d);
   const uint8_t kStream0Value = 0x5a;
   auto stream0 = make_scoped_ptr(
       new TestStream(kStream0Type, kStream0Size, kStream0Value));
-  minidump_file.AddStream(crashpad::move(stream0));
+  minidump_file.AddStream(std::move(stream0));
 
   // Make the second stream’s type be a smaller quantity than the first stream’s
   // to test that the streams show up in the order that they were added, not in
   // numeric order.
   const size_t kStream1Size = 3;
   const MinidumpStreamType kStream1Type = static_cast<MinidumpStreamType>(0x4d);
   const uint8_t kStream1Value = 0xa5;
   auto stream1 = make_scoped_ptr(
       new TestStream(kStream1Type, kStream1Size, kStream1Value));
-  minidump_file.AddStream(crashpad::move(stream1));
+  minidump_file.AddStream(std::move(stream1));
 
   const size_t kStream2Size = 1;
   const MinidumpStreamType kStream2Type = static_cast<MinidumpStreamType>(0x7e);
   const uint8_t kStream2Value = 0x36;
   auto stream2 = make_scoped_ptr(
       new TestStream(kStream2Type, kStream2Size, kStream2Value));
-  minidump_file.AddStream(crashpad::move(stream2));
+  minidump_file.AddStream(std::move(stream2));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file.WriteEverything(&string_file));
 
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
   const size_t kStream0Offset =
       kDirectoryOffset + 3 * sizeof(MINIDUMP_DIRECTORY);
   const size_t kStream1Padding = 3;
   const size_t kStream1Offset = kStream0Offset + kStream0Size + kStream1Padding;
   const size_t kStream2Padding = 1;
@@ skipping 46 matching lines @@
   std::string expected_stream2(kStream2Size, kStream2Value);
   EXPECT_EQ(0, memcmp(stream2_data, expected_stream2.c_str(), kStream2Size));
 }
 
 TEST(MinidumpFileWriter, ZeroLengthStream) {
   MinidumpFileWriter minidump_file;
 
   const size_t kStreamSize = 0;
   const MinidumpStreamType kStreamType = static_cast<MinidumpStreamType>(0x4d);
   auto stream = make_scoped_ptr(new TestStream(kStreamType, kStreamSize, 0));
-  minidump_file.AddStream(crashpad::move(stream));
+  minidump_file.AddStream(std::move(stream));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file.WriteEverything(&string_file));
 
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
   const size_t kStreamOffset = kDirectoryOffset + sizeof(MINIDUMP_DIRECTORY);
   const size_t kFileSize = kStreamOffset + kStreamSize;
 
   ASSERT_EQ(kFileSize, string_file.string().size());
 
@@ skipping 11 matching lines @@
 TEST(MinidumpFileWriter, InitializeFromSnapshot_Basic) {
   const uint32_t kSnapshotTime = 0x4976043c;
   const timeval kSnapshotTimeval = { static_cast<time_t>(kSnapshotTime), 0 };
 
   TestProcessSnapshot process_snapshot;
   process_snapshot.SetSnapshotTime(kSnapshotTimeval);
 
   auto system_snapshot = make_scoped_ptr(new TestSystemSnapshot());
   system_snapshot->SetCPUArchitecture(kCPUArchitectureX86_64);
   system_snapshot->SetOperatingSystem(SystemSnapshot::kOperatingSystemMacOSX);
-  process_snapshot.SetSystem(crashpad::move(system_snapshot));
+  process_snapshot.SetSystem(std::move(system_snapshot));
 
   auto peb_snapshot = make_scoped_ptr(new TestMemorySnapshot());
   const uint64_t kPebAddress = 0x07f90000;
   peb_snapshot->SetAddress(kPebAddress);
   const size_t kPebSize = 0x280;
   peb_snapshot->SetSize(kPebSize);
   peb_snapshot->SetValue('p');
-  process_snapshot.AddExtraMemory(crashpad::move(peb_snapshot));
+  process_snapshot.AddExtraMemory(std::move(peb_snapshot));
 
   MinidumpFileWriter minidump_file_writer;
   minidump_file_writer.InitializeFromSnapshot(&process_snapshot);
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_DIRECTORY* directory;
   const MINIDUMP_HEADER* header =
       MinidumpHeaderAtStart(string_file.string(), &directory);
@@ skipping 35 matching lines @@
   MSVC_SUPPRESS_WARNING(4309);  // Truncation of constant value.
   MSVC_SUPPRESS_WARNING(4838);  // Narrowing conversion.
   const timeval kSnapshotTimeval = { static_cast<time_t>(kSnapshotTime), 0 };
 
   TestProcessSnapshot process_snapshot;
   process_snapshot.SetSnapshotTime(kSnapshotTimeval);
 
   auto system_snapshot = make_scoped_ptr(new TestSystemSnapshot());
   system_snapshot->SetCPUArchitecture(kCPUArchitectureX86_64);
   system_snapshot->SetOperatingSystem(SystemSnapshot::kOperatingSystemMacOSX);
-  process_snapshot.SetSystem(crashpad::move(system_snapshot));
+  process_snapshot.SetSystem(std::move(system_snapshot));
 
   auto thread_snapshot = make_scoped_ptr(new TestThreadSnapshot());
   InitializeCPUContextX86_64(thread_snapshot->MutableContext(), 5);
-  process_snapshot.AddThread(crashpad::move(thread_snapshot));
+  process_snapshot.AddThread(std::move(thread_snapshot));
 
   auto exception_snapshot = make_scoped_ptr(new TestExceptionSnapshot());
   InitializeCPUContextX86_64(exception_snapshot->MutableContext(), 11);
-  process_snapshot.SetException(crashpad::move(exception_snapshot));
+  process_snapshot.SetException(std::move(exception_snapshot));
 
   // The module does not have anything that needs to be represented in a
   // MinidumpModuleCrashpadInfo structure, so no such structure is expected to
   // be present, which will in turn suppress the addition of a
   // MinidumpCrashpadInfo stream.
   auto module_snapshot = make_scoped_ptr(new TestModuleSnapshot());
-  process_snapshot.AddModule(crashpad::move(module_snapshot));
+  process_snapshot.AddModule(std::move(module_snapshot));
 
   MinidumpFileWriter minidump_file_writer;
   minidump_file_writer.InitializeFromSnapshot(&process_snapshot);
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_DIRECTORY* directory;
   const MINIDUMP_HEADER* header =
       MinidumpHeaderAtStart(string_file.string(), &directory);
@@ skipping 28 matching lines @@
 TEST(MinidumpFileWriter, InitializeFromSnapshot_CrashpadInfo) {
   const uint32_t kSnapshotTime = 0x15393bd3;
   const timeval kSnapshotTimeval = { static_cast<time_t>(kSnapshotTime), 0 };
 
   TestProcessSnapshot process_snapshot;
   process_snapshot.SetSnapshotTime(kSnapshotTimeval);
 
   auto system_snapshot = make_scoped_ptr(new TestSystemSnapshot());
   system_snapshot->SetCPUArchitecture(kCPUArchitectureX86_64);
   system_snapshot->SetOperatingSystem(SystemSnapshot::kOperatingSystemMacOSX);
-  process_snapshot.SetSystem(crashpad::move(system_snapshot));
+  process_snapshot.SetSystem(std::move(system_snapshot));
 
   auto thread_snapshot = make_scoped_ptr(new TestThreadSnapshot());
   InitializeCPUContextX86_64(thread_snapshot->MutableContext(), 5);
-  process_snapshot.AddThread(crashpad::move(thread_snapshot));
+  process_snapshot.AddThread(std::move(thread_snapshot));
 
   auto exception_snapshot = make_scoped_ptr(new TestExceptionSnapshot());
   InitializeCPUContextX86_64(exception_snapshot->MutableContext(), 11);
-  process_snapshot.SetException(crashpad::move(exception_snapshot));
+  process_snapshot.SetException(std::move(exception_snapshot));
 
   // The module needs an annotation for the MinidumpCrashpadInfo stream to be
   // considered useful and be included.
   auto module_snapshot = make_scoped_ptr(new TestModuleSnapshot());
   std::vector<std::string> annotations_list(1, std::string("annotation"));
   module_snapshot->SetAnnotationsVector(annotations_list);
-  process_snapshot.AddModule(crashpad::move(module_snapshot));
+  process_snapshot.AddModule(std::move(module_snapshot));
 
   MinidumpFileWriter minidump_file_writer;
   minidump_file_writer.InitializeFromSnapshot(&process_snapshot);
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MINIDUMP_DIRECTORY* directory;
   const MINIDUMP_HEADER* header =
       MinidumpHeaderAtStart(string_file.string(), &directory);
@@ skipping 30 matching lines @@
 }
 
 TEST(MinidumpFileWriterDeathTest, SameStreamType) {
   MinidumpFileWriter minidump_file;
 
   const size_t kStream0Size = 5;
   const MinidumpStreamType kStream0Type = static_cast<MinidumpStreamType>(0x4d);
   const uint8_t kStream0Value = 0x5a;
   auto stream0 = make_scoped_ptr(
       new TestStream(kStream0Type, kStream0Size, kStream0Value));
-  minidump_file.AddStream(crashpad::move(stream0));
+  minidump_file.AddStream(std::move(stream0));
 
   // It is an error to add a second stream of the same type.
   const size_t kStream1Size = 3;
   const MinidumpStreamType kStream1Type = static_cast<MinidumpStreamType>(0x4d);
   const uint8_t kStream1Value = 0xa5;
   auto stream1 = make_scoped_ptr(
       new TestStream(kStream1Type, kStream1Size, kStream1Value));
-  ASSERT_DEATH_CHECK(minidump_file.AddStream(crashpad::move(stream1)),
+  ASSERT_DEATH_CHECK(minidump_file.AddStream(std::move(stream1)),
                      "already present");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad