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

client/crashpad_client_mac.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 "client/crashpad_client.h"
 
 #include <errno.h>
 #include <mach/mach.h>
 #include <pthread.h>
 #include <sys/wait.h>
 #include <unistd.h>
 
+#include <utility>
+
 #include "base/logging.h"
 #include "base/mac/mach_logging.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/strings/stringprintf.h"
 #include "util/mac/mac_util.h"
 #include "util/mach/child_port_handshake.h"
 #include "util/mach/exception_ports.h"
 #include "util/mach/mach_extensions.h"
 #include "util/mach/mach_message.h"
 #include "util/mach/notify_server.h"
 #include "util/misc/clock.h"
 #include "util/misc/implicit_cast.h"
-#include "util/stdlib/move.h"
 #include "util/posix/close_multiple.h"
 
 namespace crashpad {
 
 namespace {
 
 std::string FormatArgumentString(const std::string& name,
                                  const std::string& value) {
   return base::StringPrintf("--%s=%s", name.c_str(), value.c_str());
 }
@@ skipping 106 matching lines @@
         // without the ability to restart.
         handler_restarter.reset();
       }
     }
 
     if (!CommonStart(handler,
                      database,
                      url,
                      annotations,
                      arguments,
-                     crashpad::move(receive_right),
+                     std::move(receive_right),
                      handler_restarter.get(),
                      false)) {
       return base::mac::ScopedMachSendRight();
     }
 
     if (handler_restarter &&
         handler_restarter->StartRestartThread(
             handler, database, url, annotations, arguments)) {
       // The thread owns the object now.
       ignore_result(handler_restarter.release());
@@ skipping 359 matching lines @@
       HandlerStarter::InitialStart(handler,
                                    database,
                                    url,
                                    annotations,
                                    arguments,
                                    restartable && MacOSXMinorVersion() >= 10));
   if (!exception_port.is_valid()) {
     return false;
   }
 
-  SetHandlerMachPort(crashpad::move(exception_port));
+  SetHandlerMachPort(std::move(exception_port));
   return true;
 }
 
 bool CrashpadClient::SetHandlerMachService(const std::string& service_name) {
   base::mac::ScopedMachSendRight exception_port(BootstrapLookUp(service_name));
   if (!exception_port.is_valid()) {
     return false;
   }
 
-  SetHandlerMachPort(crashpad::move(exception_port));
+  SetHandlerMachPort(std::move(exception_port));
   return true;
 }
 
 void CrashpadClient::SetHandlerMachPort(
     base::mac::ScopedMachSendRight exception_port) {
   DCHECK(exception_port.is_valid());
-  exception_port_ = crashpad::move(exception_port);
+  exception_port_ = std::move(exception_port);
 }
 
 bool CrashpadClient::UseHandler() {
   DCHECK(exception_port_.is_valid());
 
   return SetCrashExceptionPorts(exception_port_.get());
 }
 
 // static
 void CrashpadClient::UseSystemDefaultHandler() {
   base::mac::ScopedMachSendRight
       system_crash_reporter_handler(SystemCrashReporterHandler());
 
   // Proceed even if SystemCrashReporterHandler() failed, setting MACH_PORT_NULL
   // to clear the current exception ports.
   if (!SetCrashExceptionPorts(system_crash_reporter_handler.get())) {
     SetCrashExceptionPorts(MACH_PORT_NULL);
   }
 }
 
 }  // namespace crashpad