Index: util/mach/child_port_handshake.cc |
diff --git a/util/mach/child_port_handshake.cc b/util/mach/child_port_handshake.cc |
index e7cc7eed38343716d292d4eac2f89d91ef9d00fc..3fe4c449a7b7e23d298d2141367ac100a97f1498 100644 |
--- a/util/mach/child_port_handshake.cc |
+++ b/util/mach/child_port_handshake.cc |
@@ -37,6 +37,7 @@ |
#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 { |
@@ -352,30 +353,30 @@ ChildPortHandshake::~ChildPortHandshake() { |
base::ScopedFD ChildPortHandshake::ClientReadFD() { |
DCHECK(client_read_fd_.is_valid()); |
- return client_read_fd_.Pass(); |
+ return crashpad::move(client_read_fd_); |
} |
base::ScopedFD ChildPortHandshake::ServerWriteFD() { |
DCHECK(server_write_fd_.is_valid()); |
- return server_write_fd_.Pass(); |
+ return crashpad::move(server_write_fd_); |
} |
mach_port_t ChildPortHandshake::RunServer(PortRightType port_right_type) { |
client_read_fd_.reset(); |
- return RunServerForFD(server_write_fd_.Pass(), port_right_type); |
+ return RunServerForFD(crashpad::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(client_read_fd_.Pass(), port, right_type); |
+ return RunClientForFD(crashpad::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(server_write_fd.Pass(), port_right_type); |
+ return server.RunServer(crashpad::move(server_write_fd), port_right_type); |
} |
// static |