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

minidump/minidump_module_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_writer.h"
 
 #include <sys/types.h>
 
 #include <limits>
+#include <utility>
 
 #include "base/logging.h"
 #include "base/numerics/safe_conversions.h"
 #include "minidump/minidump_string_writer.h"
 #include "minidump/minidump_writer_util.h"
 #include "snapshot/module_snapshot.h"
 #include "util/file/file_writer.h"
 #include "util/misc/implicit_cast.h"
-#include "util/stdlib/move.h"
 #include "util/numeric/in_range_cast.h"
 #include "util/numeric/safe_assignment.h"
 
 namespace crashpad {
 
 MinidumpModuleCodeViewRecordWriter::~MinidumpModuleCodeViewRecordWriter() {
 }
 
 namespace internal {
 
@@ skipping 199 matching lines @@
       break;
     default:
       file_type = VFT_UNKNOWN;
       break;
   }
   SetFileTypeAndSubtype(file_type, VFT2_UNKNOWN);
 
   auto codeview_record =
       make_scoped_ptr(new MinidumpModuleCodeViewRecordPDB70Writer());
   codeview_record->InitializeFromSnapshot(module_snapshot);
-  SetCodeViewRecord(crashpad::move(codeview_record));
+  SetCodeViewRecord(std::move(codeview_record));
 }
 
 const MINIDUMP_MODULE* MinidumpModuleWriter::MinidumpModule() const {
   DCHECK_EQ(state(), kStateWritable);
 
   return &module_;
 }
 
 void MinidumpModuleWriter::SetName(const std::string& name) {
   DCHECK_EQ(state(), kStateMutable);
 
   if (!name_) {
     name_.reset(new internal::MinidumpUTF16StringWriter());
   }
   name_->SetUTF8(name);
 }
 
 void MinidumpModuleWriter::SetCodeViewRecord(
     scoped_ptr<MinidumpModuleCodeViewRecordWriter> codeview_record) {
   DCHECK_EQ(state(), kStateMutable);
 
-  codeview_record_ = crashpad::move(codeview_record);
+  codeview_record_ = std::move(codeview_record);
 }
 
 void MinidumpModuleWriter::SetMiscDebugRecord(
     scoped_ptr<MinidumpModuleMiscDebugRecordWriter> misc_debug_record) {
   DCHECK_EQ(state(), kStateMutable);
 
-  misc_debug_record_ = crashpad::move(misc_debug_record);
+  misc_debug_record_ = std::move(misc_debug_record);
 }
 
 void MinidumpModuleWriter::SetTimestamp(time_t timestamp) {
   DCHECK_EQ(state(), kStateMutable);
 
   internal::MinidumpWriterUtil::AssignTimeT(&module_.TimeDateStamp, timestamp);
 }
 
 void MinidumpModuleWriter::SetFileVersion(uint16_t version_0,
                                           uint16_t version_1,
@@ skipping 91 matching lines @@
 }
 
 void MinidumpModuleListWriter::InitializeFromSnapshot(
     const std::vector<const ModuleSnapshot*>& module_snapshots) {
   DCHECK_EQ(state(), kStateMutable);
   DCHECK(modules_.empty());
 
   for (const ModuleSnapshot* module_snapshot : module_snapshots) {
     auto module = make_scoped_ptr(new MinidumpModuleWriter());
     module->InitializeFromSnapshot(module_snapshot);
-    AddModule(crashpad::move(module));
+    AddModule(std::move(module));
   }
 }
 
 void MinidumpModuleListWriter::AddModule(
     scoped_ptr<MinidumpModuleWriter> module) {
   DCHECK_EQ(state(), kStateMutable);
 
   modules_.push_back(module.release());
 }
 
@@ skipping 45 matching lines @@
   }
 
   return file_writer->WriteIoVec(&iovecs);
 }
 
 MinidumpStreamType MinidumpModuleListWriter::StreamType() const {
   return kMinidumpStreamTypeModuleList;
 }
 
 }  // namespace crashpad