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

minidump/minidump_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_crashpad_info_writer.h"
 
+#include <utility>
+
 #include "base/logging.h"
 #include "minidump/minidump_module_crashpad_info_writer.h"
 #include "minidump/minidump_simple_string_dictionary_writer.h"
 #include "snapshot/process_snapshot.h"
 #include "util/file/file_writer.h"
-#include "util/stdlib/move.h"
 
 namespace crashpad {
 
 MinidumpCrashpadInfoWriter::MinidumpCrashpadInfoWriter()
     : MinidumpStreamWriter(),
       crashpad_info_(),
       simple_annotations_(nullptr),
       module_list_(nullptr) {
   crashpad_info_.version = MinidumpCrashpadInfo::kVersion;
 }
@@ skipping 12 matching lines @@
 
   UUID client_id;
   process_snapshot->ClientID(&client_id);
   SetClientID(client_id);
 
   auto simple_annotations =
       make_scoped_ptr(new MinidumpSimpleStringDictionaryWriter());
   simple_annotations->InitializeFromMap(
       process_snapshot->AnnotationsSimpleMap());
   if (simple_annotations->IsUseful()) {
-    SetSimpleAnnotations(crashpad::move(simple_annotations));
+    SetSimpleAnnotations(std::move(simple_annotations));
   }
 
   auto modules = make_scoped_ptr(new MinidumpModuleCrashpadInfoListWriter());
   modules->InitializeFromSnapshot(process_snapshot->Modules());
 
   if (modules->IsUseful()) {
-    SetModuleList(crashpad::move(modules));
+    SetModuleList(std::move(modules));
   }
 }
 
 void MinidumpCrashpadInfoWriter::SetReportID(const UUID& report_id) {
   DCHECK_EQ(state(), kStateMutable);
 
   crashpad_info_.report_id = report_id;
 }
 
 void MinidumpCrashpadInfoWriter::SetClientID(const UUID& client_id) {
   DCHECK_EQ(state(), kStateMutable);
 
   crashpad_info_.client_id = client_id;
 }
 
 void MinidumpCrashpadInfoWriter::SetSimpleAnnotations(
     scoped_ptr<MinidumpSimpleStringDictionaryWriter> simple_annotations) {
   DCHECK_EQ(state(), kStateMutable);
 
-  simple_annotations_ = crashpad::move(simple_annotations);
+  simple_annotations_ = std::move(simple_annotations);
 }
 
 void MinidumpCrashpadInfoWriter::SetModuleList(
     scoped_ptr<MinidumpModuleCrashpadInfoListWriter> module_list) {
   DCHECK_EQ(state(), kStateMutable);
 
-  module_list_ = crashpad::move(module_list);
+  module_list_ = std::move(module_list);
 }
 
 bool MinidumpCrashpadInfoWriter::Freeze() {
   DCHECK_EQ(state(), kStateMutable);
 
   if (!MinidumpStreamWriter::Freeze()) {
     return false;
   }
 
   if (simple_annotations_) {
@@ skipping 39 matching lines @@
 }
 
 bool MinidumpCrashpadInfoWriter::IsUseful() const {
   return crashpad_info_.report_id != UUID() ||
          crashpad_info_.client_id != UUID() ||
          simple_annotations_ ||
          module_list_;
 }
 
 }  // namespace crashpad