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

minidump/minidump_module_crashpad_info_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_module_crashpad_info_writer.h"
 
 #include <sys/types.h>
 
+#include <utility>
+
 #include "base/logging.h"
 #include "minidump/minidump_simple_string_dictionary_writer.h"
 #include "snapshot/module_snapshot.h"
 #include "util/file/file_writer.h"
-#include "util/stdlib/move.h"
 #include "util/numeric/safe_assignment.h"
 
 namespace crashpad {
 
 MinidumpModuleCrashpadInfoWriter::MinidumpModuleCrashpadInfoWriter()
     : MinidumpWritable(),
       module_(),
       list_annotations_(),
       simple_annotations_() {
   module_.version = MinidumpModuleCrashpadInfo::kVersion;
 }
 
 MinidumpModuleCrashpadInfoWriter::~MinidumpModuleCrashpadInfoWriter() {
 }
 
 void MinidumpModuleCrashpadInfoWriter::InitializeFromSnapshot(
     const ModuleSnapshot* module_snapshot) {
   DCHECK_EQ(state(), kStateMutable);
   DCHECK(!list_annotations_);
   DCHECK(!simple_annotations_);
 
   auto list_annotations = make_scoped_ptr(new MinidumpUTF8StringListWriter());
   list_annotations->InitializeFromVector(module_snapshot->AnnotationsVector());
   if (list_annotations->IsUseful()) {
-    SetListAnnotations(crashpad::move(list_annotations));
+    SetListAnnotations(std::move(list_annotations));
   }
 
   auto simple_annotations =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryWriter());
   simple_annotations->InitializeFromMap(
       module_snapshot->AnnotationsSimpleMap());
   if (simple_annotations->IsUseful()) {
-    SetSimpleAnnotations(crashpad::move(simple_annotations));
+    SetSimpleAnnotations(std::move(simple_annotations));
   }
 }
 
 void MinidumpModuleCrashpadInfoWriter::SetListAnnotations(
     scoped_ptr<MinidumpUTF8StringListWriter> list_annotations) {
   DCHECK_EQ(state(), kStateMutable);
 
-  list_annotations_ = crashpad::move(list_annotations);
+  list_annotations_ = std::move(list_annotations);
 }
 
 void MinidumpModuleCrashpadInfoWriter::SetSimpleAnnotations(
     scoped_ptr<MinidumpSimpleStringDictionaryWriter> simple_annotations) {
   DCHECK_EQ(state(), kStateMutable);
 
-  simple_annotations_ = crashpad::move(simple_annotations);
+  simple_annotations_ = std::move(simple_annotations);
 }
 
 bool MinidumpModuleCrashpadInfoWriter::IsUseful() const {
   return list_annotations_ || simple_annotations_;
 }
 
 bool MinidumpModuleCrashpadInfoWriter::Freeze() {
   DCHECK_EQ(state(), kStateMutable);
 
   if (!MinidumpWritable::Freeze()) {
@@ skipping 56 matching lines @@
   DCHECK(module_crashpad_infos_.empty());
   DCHECK(module_crashpad_info_links_.empty());
 
   size_t count = module_snapshots.size();
   for (size_t index = 0; index < count; ++index) {
     const ModuleSnapshot* module_snapshot = module_snapshots[index];
 
     auto module = make_scoped_ptr(new MinidumpModuleCrashpadInfoWriter());
     module->InitializeFromSnapshot(module_snapshot);
     if (module->IsUseful()) {
-      AddModule(crashpad::move(module), index);
+      AddModule(std::move(module), index);
     }
   }
 }
 
 void MinidumpModuleCrashpadInfoListWriter::AddModule(
     scoped_ptr<MinidumpModuleCrashpadInfoWriter> module_crashpad_info,
     size_t minidump_module_list_index) {
   DCHECK_EQ(state(), kStateMutable);
   DCHECK_EQ(module_crashpad_infos_.size(), module_crashpad_info_links_.size());
 
@@ skipping 72 matching lines @@
     iov.iov_base = &module_crashpad_info_links_[0];
     iov.iov_len = module_crashpad_info_links_.size() *
                   sizeof(module_crashpad_info_links_[0]);
     iovecs.push_back(iov);
   }
 
   return file_writer->WriteIoVec(&iovecs);
 }
 
 }  // namespace crashpad