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

minidump/minidump_handle_writer_test.cc

 // Copyright 2015 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_handle_writer.h"
 
 #include <string>
+#include <utility>
 
 #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_string_writer_test_util.h"
 #include "minidump/test/minidump_writable_test_util.h"
 #include "util/file/string_file.h"
-#include "util/stdlib/move.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 // The handle data stream is expected to be the only stream.
 void GetHandleDataStream(
     const std::string& file_contents,
     const MINIDUMP_HANDLE_DATA_STREAM** handle_data_stream) {
   const size_t kDirectoryOffset = sizeof(MINIDUMP_HEADER);
@@ skipping 14 matching lines @@
 
   *handle_data_stream =
       MinidumpWritableAtLocationDescriptor<MINIDUMP_HANDLE_DATA_STREAM>(
           file_contents, directory[kDirectoryIndex].Location);
   ASSERT_TRUE(*handle_data_stream);
 }
 
 TEST(MinidumpHandleDataWriter, Empty) {
   MinidumpFileWriter minidump_file_writer;
   auto handle_data_writer = make_scoped_ptr(new MinidumpHandleDataWriter());
-  minidump_file_writer.AddStream(crashpad::move(handle_data_writer));
+  minidump_file_writer.AddStream(std::move(handle_data_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   ASSERT_EQ(sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
                 sizeof(MINIDUMP_HANDLE_DATA_STREAM),
             string_file.string().size());
 
   const MINIDUMP_HANDLE_DATA_STREAM* handle_data_stream = nullptr;
   ASSERT_NO_FATAL_FAILURE(
@@ skipping 12 matching lines @@
   handle_snapshot.attributes = 0x12345678;
   handle_snapshot.granted_access = 0x9abcdef0;
   handle_snapshot.pointer_count = 4567;
   handle_snapshot.handle_count = 9876;
 
   std::vector<HandleSnapshot> snapshot;
   snapshot.push_back(handle_snapshot);
 
   handle_data_writer->InitializeFromSnapshot(snapshot);
 
-  minidump_file_writer.AddStream(crashpad::move(handle_data_writer));
+  minidump_file_writer.AddStream(std::move(handle_data_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const size_t kTypeNameStringDataLength =
       (handle_snapshot.type_name.size() + 1) * sizeof(base::char16);
   ASSERT_EQ(sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
                 sizeof(MINIDUMP_HANDLE_DATA_STREAM) +
                 sizeof(MINIDUMP_HANDLE_DESCRIPTOR) + sizeof(MINIDUMP_STRING) +
                 kTypeNameStringDataLength,
@@ skipping 37 matching lines @@
   handle_snapshot2.granted_access = 0x0fedcba9;
   handle_snapshot2.pointer_count = 7654;
   handle_snapshot2.handle_count = 6789;
 
   std::vector<HandleSnapshot> snapshot;
   snapshot.push_back(handle_snapshot);
   snapshot.push_back(handle_snapshot2);
 
   handle_data_writer->InitializeFromSnapshot(snapshot);
 
-  minidump_file_writer.AddStream(crashpad::move(handle_data_writer));
+  minidump_file_writer.AddStream(std::move(handle_data_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const size_t kTypeNameStringDataLength =
       (handle_snapshot.type_name.size() + 1) * sizeof(base::char16);
   ASSERT_EQ(sizeof(MINIDUMP_HEADER) + sizeof(MINIDUMP_DIRECTORY) +
                 sizeof(MINIDUMP_HANDLE_DATA_STREAM) +
                 (sizeof(MINIDUMP_HANDLE_DESCRIPTOR) * 2) +
                 sizeof(MINIDUMP_STRING) + kTypeNameStringDataLength,
@@ skipping 30 matching lines @@
   EXPECT_EQ(handle_snapshot2.granted_access, handle_descriptor2->GrantedAccess);
   EXPECT_EQ(handle_snapshot2.handle_count, handle_descriptor2->HandleCount);
   EXPECT_EQ(handle_snapshot2.pointer_count, handle_descriptor2->PointerCount);
 
   EXPECT_EQ(handle_descriptor->TypeNameRva, handle_descriptor2->TypeNameRva);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad