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

minidump/minidump_exception_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_exception_writer.h"
 
 #include <windows.h>
 #include <dbghelp.h>
 #include <stdint.h>
 #include <sys/types.h>
 
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "gtest/gtest.h"
 #include "minidump/minidump_context.h"
 #include "minidump/minidump_context_writer.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_file_writer.h"
 #include "minidump/minidump_thread_id_map.h"
 #include "minidump/test/minidump_context_test_util.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 "test/gtest_death_check.h"
 #include "util/file/string_file.h"
-#include "util/stdlib/move.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 // This returns the MINIDUMP_EXCEPTION_STREAM stream in |exception_stream|.
 void GetExceptionStream(const std::string& file_contents,
                         const MINIDUMP_EXCEPTION_STREAM** exception_stream) {
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
   const size_t kExceptionStreamOffset =
@@ skipping 49 matching lines @@
 }
 
 TEST(MinidumpExceptionWriter, Minimal) {
   MinidumpFileWriter minidump_file_writer;
   auto exception_writer = make_scoped_ptr(new MinidumpExceptionWriter());
 
   const uint32_t kSeed = 100;
 
   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));
 
   const MINIDUMP_EXCEPTION_STREAM* observed_exception_stream = nullptr;
   ASSERT_NO_FATAL_FAILURE(
       GetExceptionStream(string_file.string(), &observed_exception_stream));
 
   MINIDUMP_EXCEPTION_STREAM expected_exception_stream = {};
   expected_exception_stream.ThreadContext.DataSize = sizeof(MinidumpContextX86);
@@ skipping 17 matching lines @@
   const uint32_t kExceptionCode = 2;
   const uint32_t kExceptionFlags = 3;
   const uint32_t kExceptionRecord = 4;
   const uint32_t kExceptionAddress = 5;
   const uint64_t kExceptionInformation0 = 6;
   const uint64_t kExceptionInformation1 = 7;
   const uint64_t kExceptionInformation2 = 7;
 
   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);
   exception_writer->SetExceptionFlags(kExceptionFlags);
   exception_writer->SetExceptionRecord(kExceptionRecord);
   exception_writer->SetExceptionAddress(kExceptionAddress);
 
   // Set a lot of exception information at first, and then replace it with less.
   // This tests that the exception that is written does not contain the
   // “garbage” from the initial SetExceptionInformation() call.
   std::vector<uint64_t> exception_information(EXCEPTION_MAXIMUM_PARAMETERS,
                                               0x5a5a5a5a5a5a5a5a);
   exception_writer->SetExceptionInformation(exception_information);
 
   exception_information.clear();
   exception_information.push_back(kExceptionInformation0);
   exception_information.push_back(kExceptionInformation1);
   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));
 
   const MINIDUMP_EXCEPTION_STREAM* observed_exception_stream = nullptr;
   ASSERT_NO_FATAL_FAILURE(
       GetExceptionStream(string_file.string(), &observed_exception_stream));
 
   MINIDUMP_EXCEPTION_STREAM expected_exception_stream = {};
   expected_exception_stream.ThreadId = kThreadID;
@@ skipping 52 matching lines @@
 
   InitializeCPUContextX86(exception_snapshot.MutableContext(), kSeed);
 
   MinidumpThreadIDMap thread_id_map;
   thread_id_map[kThreadID] = expect_exception.ThreadId;
 
   auto exception_writer = make_scoped_ptr(new MinidumpExceptionWriter());
   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));
 
   const MINIDUMP_EXCEPTION_STREAM* exception = nullptr;
   ASSERT_NO_FATAL_FAILURE(GetExceptionStream(string_file.string(), &exception));
 
   const MinidumpContextX86* observed_context = nullptr;
   ASSERT_NO_FATAL_FAILURE(ExpectExceptionStream(&expect_exception,
                                                 exception,
                                                 string_file.string(),
                                                 &observed_context));
 
   ASSERT_NO_FATAL_FAILURE(
       ExpectMinidumpContextX86(kSeed, observed_context, true));
 }
 
 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),
                      "context_");
 }
 
 TEST(MinidumpExceptionWriterDeathTest, TooMuchInformation) {
   MinidumpExceptionWriter exception_writer;
   std::vector<uint64_t> exception_information(EXCEPTION_MAXIMUM_PARAMETERS + 1,
                                               0x5a5a5a5a5a5a5a5a);
   ASSERT_DEATH_CHECK(
       exception_writer.SetExceptionInformation(exception_information),
       "kMaxParameters");
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad