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

minidump/minidump_module_crashpad_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_module_crashpad_info_writer.h"
 
 #include <windows.h>
 #include <dbghelp.h>
 
+#include <utility>
+
 #include "gtest/gtest.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_simple_string_dictionary_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_module_snapshot.h"
 #include "util/file/string_file.h"
-#include "util/stdlib/move.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 const MinidumpModuleCrashpadInfoList* MinidumpModuleCrashpadInfoListAtStart(
     const std::string& file_contents,
     size_t count) {
   MINIDUMP_LOCATION_DESCRIPTOR location_descriptor;
   location_descriptor.DataSize =
@@ skipping 32 matching lines @@
   ASSERT_TRUE(module_list);
 }
 
 TEST(MinidumpModuleCrashpadInfoWriter, EmptyModule) {
   StringFile string_file;
 
   auto module_list_writer =
       make_scoped_ptr(new MinidumpModuleCrashpadInfoListWriter());
   auto module_writer = make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter());
   EXPECT_FALSE(module_writer->IsUseful());
-  module_list_writer->AddModule(crashpad::move(module_writer), 0);
+  module_list_writer->AddModule(std::move(module_writer), 0);
 
   EXPECT_TRUE(module_list_writer->IsUseful());
 
   EXPECT_TRUE(module_list_writer->WriteEverything(&string_file));
   ASSERT_EQ(sizeof(MinidumpModuleCrashpadInfoList) +
                 sizeof(MinidumpModuleCrashpadInfoLink) +
                 sizeof(MinidumpModuleCrashpadInfo),
             string_file.string().size());
 
   const MinidumpModuleCrashpadInfoList* module_list =
@@ skipping 21 matching lines @@
   std::vector<std::string> vector(1, std::string(kEntry));
 
   StringFile string_file;
 
   auto module_list_writer =
       make_scoped_ptr(new MinidumpModuleCrashpadInfoListWriter());
 
   auto module_writer = make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter());
   auto string_list_writer = make_scoped_ptr(new MinidumpUTF8StringListWriter());
   string_list_writer->InitializeFromVector(vector);
-  module_writer->SetListAnnotations(crashpad::move(string_list_writer));
+  module_writer->SetListAnnotations(std::move(string_list_writer));
   auto simple_string_dictionary_writer =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryWriter());
   auto simple_string_dictionary_entry_writer =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
   simple_string_dictionary_entry_writer->SetKeyValue(kKey, kValue);
   simple_string_dictionary_writer->AddEntry(
-      crashpad::move(simple_string_dictionary_entry_writer));
+      std::move(simple_string_dictionary_entry_writer));
   module_writer->SetSimpleAnnotations(
-      crashpad::move(simple_string_dictionary_writer));
+      std::move(simple_string_dictionary_writer));
   EXPECT_TRUE(module_writer->IsUseful());
-  module_list_writer->AddModule(crashpad::move(module_writer),
+  module_list_writer->AddModule(std::move(module_writer),
                                 kMinidumpModuleListIndex);
 
   EXPECT_TRUE(module_list_writer->IsUseful());
 
   EXPECT_TRUE(module_list_writer->WriteEverything(&string_file));
   ASSERT_EQ(sizeof(MinidumpModuleCrashpadInfoList) +
                 sizeof(MinidumpModuleCrashpadInfoLink) +
                 sizeof(MinidumpModuleCrashpadInfo) +
                 sizeof(MinidumpRVAList) +
                 sizeof(RVA) +
@@ skipping 62 matching lines @@
       make_scoped_ptr(new MinidumpModuleCrashpadInfoListWriter());
 
   auto module_writer_0 =
       make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter());
   auto simple_string_dictionary_writer_0 =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryWriter());
   auto simple_string_dictionary_entry_writer_0 =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
   simple_string_dictionary_entry_writer_0->SetKeyValue(kKey0, kValue0);
   simple_string_dictionary_writer_0->AddEntry(
-      crashpad::move(simple_string_dictionary_entry_writer_0));
+      std::move(simple_string_dictionary_entry_writer_0));
   module_writer_0->SetSimpleAnnotations(
-      crashpad::move(simple_string_dictionary_writer_0));
+      std::move(simple_string_dictionary_writer_0));
   EXPECT_TRUE(module_writer_0->IsUseful());
-  module_list_writer->AddModule(crashpad::move(module_writer_0),
+  module_list_writer->AddModule(std::move(module_writer_0),
                                 kMinidumpModuleListIndex0);
 
   auto module_writer_1 =
       make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter());
   EXPECT_FALSE(module_writer_1->IsUseful());
-  module_list_writer->AddModule(crashpad::move(module_writer_1),
+  module_list_writer->AddModule(std::move(module_writer_1),
                                 kMinidumpModuleListIndex1);
 
   auto module_writer_2 =
       make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter());
   auto simple_string_dictionary_writer_2 =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryWriter());
   auto simple_string_dictionary_entry_writer_2a =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
   simple_string_dictionary_entry_writer_2a->SetKeyValue(kKey2A, kValue2A);
   simple_string_dictionary_writer_2->AddEntry(
-      crashpad::move(simple_string_dictionary_entry_writer_2a));
+      std::move(simple_string_dictionary_entry_writer_2a));
   auto simple_string_dictionary_entry_writer_2b =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryEntryWriter());
   simple_string_dictionary_entry_writer_2b->SetKeyValue(kKey2B, kValue2B);
   simple_string_dictionary_writer_2->AddEntry(
-      crashpad::move(simple_string_dictionary_entry_writer_2b));
+      std::move(simple_string_dictionary_entry_writer_2b));
   module_writer_2->SetSimpleAnnotations(
-      crashpad::move(simple_string_dictionary_writer_2));
+      std::move(simple_string_dictionary_writer_2));
   EXPECT_TRUE(module_writer_2->IsUseful());
-  module_list_writer->AddModule(crashpad::move(module_writer_2),
+  module_list_writer->AddModule(std::move(module_writer_2),
                                 kMinidumpModuleListIndex2);
 
   EXPECT_TRUE(module_list_writer->IsUseful());
 
   EXPECT_TRUE(module_list_writer->WriteEverything(&string_file));
 
   const MinidumpModuleCrashpadInfoList* module_list =
       MinidumpModuleCrashpadInfoListAtStart(string_file.string(), 3);
   ASSERT_TRUE(module_list);
 
@@ skipping 207 matching lines @@
 
   const MinidumpSimpleStringDictionary* simple_annotations_3 =
       MinidumpWritableAtLocationDescriptor<MinidumpSimpleStringDictionary>(
           string_file.string(), module_3->simple_annotations);
   EXPECT_FALSE(simple_annotations_3);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad