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

minidump/minidump_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_crashpad_info_writer.h"
 
 #include <windows.h>
 #include <dbghelp.h>
 
 #include <map>
 #include <string>
+#include <utility>
 
 #include "gtest/gtest.h"
 #include "minidump/minidump_extensions.h"
 #include "minidump/minidump_file_writer.h"
 #include "minidump/minidump_module_crashpad_info_writer.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 "snapshot/test/test_process_snapshot.h"
 #include "util/file/string_file.h"
-#include "util/stdlib/move.h"
 
 namespace crashpad {
 namespace test {
 namespace {
 
 void GetCrashpadInfoStream(
     const std::string& file_contents,
     const MinidumpCrashpadInfo** crashpad_info,
     const MinidumpSimpleStringDictionary** simple_annotations,
     const MinidumpModuleCrashpadInfoList** module_list) {
@@ skipping 16 matching lines @@
   *module_list =
       MinidumpWritableAtLocationDescriptor<MinidumpModuleCrashpadInfoList>(
           file_contents, (*crashpad_info)->module_list);
 }
 
 TEST(MinidumpCrashpadInfoWriter, Empty) {
   MinidumpFileWriter minidump_file_writer;
   auto crashpad_info_writer = make_scoped_ptr(new MinidumpCrashpadInfoWriter());
   EXPECT_FALSE(crashpad_info_writer->IsUseful());
 
-  minidump_file_writer.AddStream(crashpad::move(crashpad_info_writer));
+  minidump_file_writer.AddStream(std::move(crashpad_info_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MinidumpCrashpadInfo* crashpad_info = nullptr;
   const MinidumpSimpleStringDictionary* simple_annotations = nullptr;
   const MinidumpModuleCrashpadInfoList* module_list = nullptr;
 
   ASSERT_NO_FATAL_FAILURE(GetCrashpadInfoStream(
       string_file.string(), &crashpad_info, &simple_annotations, &module_list));
@@ skipping 14 matching lines @@
       report_id.InitializeFromString("01234567-89ab-cdef-0123-456789abcdef"));
   crashpad_info_writer->SetReportID(report_id);
 
   UUID client_id;
   ASSERT_TRUE(
       client_id.InitializeFromString("00112233-4455-6677-8899-aabbccddeeff"));
   crashpad_info_writer->SetClientID(client_id);
 
   EXPECT_TRUE(crashpad_info_writer->IsUseful());
 
-  minidump_file_writer.AddStream(crashpad::move(crashpad_info_writer));
+  minidump_file_writer.AddStream(std::move(crashpad_info_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MinidumpCrashpadInfo* crashpad_info = nullptr;
   const MinidumpSimpleStringDictionary* simple_annotations = nullptr;
   const MinidumpModuleCrashpadInfoList* module_list = nullptr;
 
   ASSERT_NO_FATAL_FAILURE(GetCrashpadInfoStream(
       string_file.string(), &crashpad_info, &simple_annotations, &module_list));
@@ skipping 14 matching lines @@
       "something";
   const char kValue[] =
       "the numerical amount denoted by an algebraic term; a magnitude, "
       "quantity, or number";
   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));
   crashpad_info_writer->SetSimpleAnnotations(
-      crashpad::move(simple_string_dictionary_writer));
+      std::move(simple_string_dictionary_writer));
 
   EXPECT_TRUE(crashpad_info_writer->IsUseful());
 
-  minidump_file_writer.AddStream(crashpad::move(crashpad_info_writer));
+  minidump_file_writer.AddStream(std::move(crashpad_info_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MinidumpCrashpadInfo* crashpad_info = nullptr;
   const MinidumpSimpleStringDictionary* simple_annotations = nullptr;
   const MinidumpModuleCrashpadInfoList* module_list = nullptr;
 
   ASSERT_NO_FATAL_FAILURE(GetCrashpadInfoStream(
       string_file.string(), &crashpad_info, &simple_annotations, &module_list));
@@ skipping 13 matching lines @@
 
 TEST(MinidumpCrashpadInfoWriter, CrashpadModuleList) {
   const uint32_t kMinidumpModuleListIndex = 3;
 
   MinidumpFileWriter minidump_file_writer;
   auto crashpad_info_writer = make_scoped_ptr(new MinidumpCrashpadInfoWriter());
 
   auto module_list_writer =
       make_scoped_ptr(new MinidumpModuleCrashpadInfoListWriter());
   auto module_writer = make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter());
-  module_list_writer->AddModule(crashpad::move(module_writer), kMinidumpModuleListIndex);
-  crashpad_info_writer->SetModuleList(crashpad::move(module_list_writer));
+  module_list_writer->AddModule(std::move(module_writer),
+                                kMinidumpModuleListIndex);
+  crashpad_info_writer->SetModuleList(std::move(module_list_writer));
 
   EXPECT_TRUE(crashpad_info_writer->IsUseful());
 
-  minidump_file_writer.AddStream(crashpad::move(crashpad_info_writer));
+  minidump_file_writer.AddStream(std::move(crashpad_info_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MinidumpCrashpadInfo* crashpad_info = nullptr;
   const MinidumpSimpleStringDictionary* simple_annotations = nullptr;
   const MinidumpModuleCrashpadInfoList* module_list = nullptr;
 
   ASSERT_NO_FATAL_FAILURE(GetCrashpadInfoStream(
       string_file.string(), &crashpad_info, &simple_annotations, &module_list));
@@ skipping 29 matching lines @@
 
   const char kKey[] = "version";
   const char kValue[] = "40.0.2214.111";
   const char kEntry[] = "This is a simple annotation in a list.";
 
   // Test with a useless module, one that doesn’t carry anything that would
   // require MinidumpCrashpadInfo or any child object.
   auto process_snapshot = make_scoped_ptr(new TestProcessSnapshot());
 
   auto module_snapshot = make_scoped_ptr(new TestModuleSnapshot());
-  process_snapshot->AddModule(crashpad::move(module_snapshot));
+  process_snapshot->AddModule(std::move(module_snapshot));
 
   auto info_writer = make_scoped_ptr(new MinidumpCrashpadInfoWriter());
   info_writer->InitializeFromSnapshot(process_snapshot.get());
   EXPECT_FALSE(info_writer->IsUseful());
 
   // Try again with a useful module.
   process_snapshot.reset(new TestProcessSnapshot());
 
   process_snapshot->SetReportID(report_id);
   process_snapshot->SetClientID(client_id);
 
   std::map<std::string, std::string> annotations_simple_map;
   annotations_simple_map[kKey] = kValue;
   process_snapshot->SetAnnotationsSimpleMap(annotations_simple_map);
 
   module_snapshot.reset(new TestModuleSnapshot());
   std::vector<std::string> annotations_list(1, std::string(kEntry));
   module_snapshot->SetAnnotationsVector(annotations_list);
-  process_snapshot->AddModule(crashpad::move(module_snapshot));
+  process_snapshot->AddModule(std::move(module_snapshot));
 
   info_writer.reset(new MinidumpCrashpadInfoWriter());
   info_writer->InitializeFromSnapshot(process_snapshot.get());
   EXPECT_TRUE(info_writer->IsUseful());
 
   MinidumpFileWriter minidump_file_writer;
-  minidump_file_writer.AddStream(crashpad::move(info_writer));
+  minidump_file_writer.AddStream(std::move(info_writer));
 
   StringFile string_file;
   ASSERT_TRUE(minidump_file_writer.WriteEverything(&string_file));
 
   const MinidumpCrashpadInfo* info = nullptr;
   const MinidumpSimpleStringDictionary* simple_annotations;
   const MinidumpModuleCrashpadInfoList* module_list;
   ASSERT_NO_FATAL_FAILURE(GetCrashpadInfoStream(
       string_file.string(), &info, &simple_annotations, &module_list));
 
@@ skipping 34 matching lines @@
 
   const MinidumpSimpleStringDictionary* module_simple_annotations =
       MinidumpWritableAtLocationDescriptor<MinidumpSimpleStringDictionary>(
           string_file.string(), module->simple_annotations);
   EXPECT_FALSE(module_simple_annotations);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace crashpad