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

minidump/minidump_file_writer.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 <utility>
+
 #include "base/logging.h"
 #include "minidump/minidump_crashpad_info_writer.h"
 #include "minidump/minidump_exception_writer.h"
 #include "minidump/minidump_handle_writer.h"
 #include "minidump/minidump_memory_info_writer.h"
 #include "minidump/minidump_memory_writer.h"
 #include "minidump/minidump_misc_info_writer.h"
 #include "minidump/minidump_module_writer.h"
 #include "minidump/minidump_system_info_writer.h"
 #include "minidump/minidump_thread_id_map.h"
 #include "minidump/minidump_thread_writer.h"
 #include "minidump/minidump_writer_util.h"
 #include "snapshot/process_snapshot.h"
 #include "util/file/file_writer.h"
-#include "util/stdlib/move.h"
 #include "util/numeric/safe_assignment.h"
 
 namespace crashpad {
 
 MinidumpFileWriter::MinidumpFileWriter()
     : MinidumpWritable(), header_(), streams_(), stream_types_() {
   // Don’t set the signature field right away. Leave it set to 0, so that a
   // partially-written minidump file isn’t confused for a complete and valid
   // one. The header will be rewritten in WriteToFile().
   header_.Signature = 0;
@@ skipping 19 matching lines @@
   // done by MinidumpMiscInfoWriter::InitializeFromSnapshot(). Handling both
   // timestamps in the same way allows the highest-fidelity computation of
   // process uptime as the difference between the two values.
   timeval snapshot_time;
   process_snapshot->SnapshotTime(&snapshot_time);
   SetTimestamp(snapshot_time.tv_sec);
 
   const SystemSnapshot* system_snapshot = process_snapshot->System();
   auto system_info = make_scoped_ptr(new MinidumpSystemInfoWriter());
   system_info->InitializeFromSnapshot(system_snapshot);
-  AddStream(crashpad::move(system_info));
+  AddStream(std::move(system_info));
 
   auto misc_info = make_scoped_ptr(new MinidumpMiscInfoWriter());
   misc_info->InitializeFromSnapshot(process_snapshot);
-  AddStream(crashpad::move(misc_info));
+  AddStream(std::move(misc_info));
 
   auto memory_list = make_scoped_ptr(new MinidumpMemoryListWriter());
   auto thread_list = make_scoped_ptr(new MinidumpThreadListWriter());
   thread_list->SetMemoryListWriter(memory_list.get());
   MinidumpThreadIDMap thread_id_map;
   thread_list->InitializeFromSnapshot(process_snapshot->Threads(),
                                       &thread_id_map);
-  AddStream(crashpad::move(thread_list));
+  AddStream(std::move(thread_list));
 
   const ExceptionSnapshot* exception_snapshot = process_snapshot->Exception();
   if (exception_snapshot) {
     auto exception = make_scoped_ptr(new MinidumpExceptionWriter());
     exception->InitializeFromSnapshot(exception_snapshot, thread_id_map);
-    AddStream(crashpad::move(exception));
+    AddStream(std::move(exception));
   }
 
   auto module_list = make_scoped_ptr(new MinidumpModuleListWriter());
   module_list->InitializeFromSnapshot(process_snapshot->Modules());
-  AddStream(crashpad::move(module_list));
+  AddStream(std::move(module_list));
 
   auto crashpad_info = make_scoped_ptr(new MinidumpCrashpadInfoWriter());
   crashpad_info->InitializeFromSnapshot(process_snapshot);
 
   // Since the MinidumpCrashpadInfo stream is an extension, it’s safe to not add
   // it to the minidump file if it wouldn’t carry any useful information.
   if (crashpad_info->IsUseful()) {
-    AddStream(crashpad::move(crashpad_info));
+    AddStream(std::move(crashpad_info));
   }
 
   std::vector<const MemoryMapRegionSnapshot*> memory_map_snapshot =
       process_snapshot->MemoryMap();
   if (!memory_map_snapshot.empty()) {
     auto memory_info_list = make_scoped_ptr(new MinidumpMemoryInfoListWriter());
     memory_info_list->InitializeFromSnapshot(memory_map_snapshot);
-    AddStream(crashpad::move(memory_info_list));
+    AddStream(std::move(memory_info_list));
   }
 
   std::vector<HandleSnapshot> handles_snapshot = process_snapshot->Handles();
   if (!handles_snapshot.empty()) {
     auto handle_data_writer = make_scoped_ptr(new MinidumpHandleDataWriter());
     handle_data_writer->InitializeFromSnapshot(handles_snapshot);
-    AddStream(crashpad::move(handle_data_writer));
+    AddStream(std::move(handle_data_writer));
   }
 
   memory_list->AddFromSnapshot(process_snapshot->ExtraMemory());
 
-  AddStream(crashpad::move(memory_list));
+  AddStream(std::move(memory_list));
 }
 
 void MinidumpFileWriter::SetTimestamp(time_t timestamp) {
   DCHECK_EQ(state(), kStateMutable);
 
   internal::MinidumpWriterUtil::AssignTimeT(&header_.TimeDateStamp, timestamp);
 }
 
 void MinidumpFileWriter::AddStream(
     scoped_ptr<internal::MinidumpStreamWriter> stream) {
@@ skipping 107 matching lines @@
   for (internal::MinidumpStreamWriter* stream : streams_) {
     iov.iov_base = stream->DirectoryListEntry();
     iov.iov_len = sizeof(MINIDUMP_DIRECTORY);
     iovecs.push_back(iov);
   }
 
   return file_writer->WriteIoVec(&iovecs);
 }
 
 }  // namespace crashpad