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

util/mach/child_port_handshake.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 "util/mach/child_port_handshake.h"
 
 #include <errno.h>
 #include <pthread.h>
 #include <sys/event.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>
 
 #include <algorithm>
+#include <utility>
 
 #include "base/logging.h"
 #include "base/mac/mach_logging.h"
 #include "base/mac/scoped_mach_port.h"
 #include "base/posix/eintr_wrapper.h"
 #include "base/rand_util.h"
 #include "base/strings/stringprintf.h"
 #include "util/file/file_io.h"
 #include "util/mach/child_port.h"
 #include "util/mach/child_port_server.h"
 #include "util/mach/mach_extensions.h"
 #include "util/mach/mach_message.h"
 #include "util/mach/mach_message_server.h"
 #include "util/misc/implicit_cast.h"
-#include "util/stdlib/move.h"
 #include "util/misc/random_string.h"
 
 namespace crashpad {
 namespace {
 
 class ChildPortHandshakeServer final : public ChildPortServer::Interface {
  public:
   ChildPortHandshakeServer();
   ~ChildPortHandshakeServer();
 
@@ skipping 295 matching lines @@
                     SO_NOSIGPIPE,
                     &value,
                     sizeof(value)) == 0) << "setsockopt";
 }
 
 ChildPortHandshake::~ChildPortHandshake() {
 }
 
 base::ScopedFD ChildPortHandshake::ClientReadFD() {
   DCHECK(client_read_fd_.is_valid());
-  return crashpad::move(client_read_fd_);
+  return std::move(client_read_fd_);
 }
 
 base::ScopedFD ChildPortHandshake::ServerWriteFD() {
   DCHECK(server_write_fd_.is_valid());
-  return crashpad::move(server_write_fd_);
+  return std::move(server_write_fd_);
 }
 
 mach_port_t ChildPortHandshake::RunServer(PortRightType port_right_type) {
   client_read_fd_.reset();
-  return RunServerForFD(crashpad::move(server_write_fd_), port_right_type);
+  return RunServerForFD(std::move(server_write_fd_), port_right_type);
 }
 
 bool ChildPortHandshake::RunClient(mach_port_t port,
                                    mach_msg_type_name_t right_type) {
   server_write_fd_.reset();
-  return RunClientForFD(crashpad::move(client_read_fd_), port, right_type);
+  return RunClientForFD(std::move(client_read_fd_), port, right_type);
 }
 
 // static
 mach_port_t ChildPortHandshake::RunServerForFD(base::ScopedFD server_write_fd,
                                                PortRightType port_right_type) {
   ChildPortHandshakeServer server;
-  return server.RunServer(crashpad::move(server_write_fd), port_right_type);
+  return server.RunServer(std::move(server_write_fd), port_right_type);
 }
 
 // static
 bool ChildPortHandshake::RunClientForFD(base::ScopedFD client_read_fd,
                                         mach_port_t port,
                                         mach_msg_type_name_t right_type) {
   DCHECK(client_read_fd.is_valid());
 
   // Read the token and the service name from the read side of the pipe.
   child_port_token_t token;
@@ skipping 51 matching lines @@
       server_port.get(), token, port, right_type);
   if (kr != KERN_SUCCESS) {
     MACH_LOG(ERROR, kr) << "child_port_check_in";
     return false;
   }
 
   return true;
 }
 
 }  // namespace crashpad