Index: mojo/public/cpp/bindings/lib/connector.cc |
diff --git a/mojo/public/cpp/bindings/lib/connector.cc b/mojo/public/cpp/bindings/lib/connector.cc |
index af45bfc67f240a1b257c0b857c08550340879961..eaca028f05274f95e6f7c2d4ee09be6057ea5cee 100644 |
--- a/mojo/public/cpp/bindings/lib/connector.cc |
+++ b/mojo/public/cpp/bindings/lib/connector.cc |
@@ -4,6 +4,8 @@ |
#include "mojo/public/cpp/bindings/lib/connector.h" |
+#include <utility> |
+ |
#include "base/logging.h" |
#include "base/macros.h" |
#include "base/synchronization/lock.h" |
@@ -42,7 +44,7 @@ Connector::Connector(ScopedMessagePipeHandle message_pipe, |
ConnectorConfig config, |
const MojoAsyncWaiter* waiter) |
: waiter_(waiter), |
- message_pipe_(message_pipe.Pass()), |
+ message_pipe_(std::move(message_pipe)), |
incoming_receiver_(nullptr), |
async_wait_id_(0), |
error_(false), |
@@ -70,7 +72,7 @@ void Connector::CloseMessagePipe() { |
CancelWait(); |
MayAutoLock locker(lock_.get()); |
- Close(message_pipe_.Pass()); |
+ Close(std::move(message_pipe_)); |
} |
ScopedMessagePipeHandle Connector::PassMessagePipe() { |
@@ -78,7 +80,7 @@ ScopedMessagePipeHandle Connector::PassMessagePipe() { |
CancelWait(); |
MayAutoLock locker(lock_.get()); |
- return message_pipe_.Pass(); |
+ return std::move(message_pipe_); |
} |
void Connector::RaiseError() { |
@@ -292,9 +294,9 @@ void Connector::HandleError(bool force_pipe_reset, bool force_async_handler) { |
if (force_pipe_reset) { |
CancelWait(); |
MayAutoLock locker(lock_.get()); |
- Close(message_pipe_.Pass()); |
+ Close(std::move(message_pipe_)); |
MessagePipe dummy_pipe; |
- message_pipe_ = dummy_pipe.handle0.Pass(); |
+ message_pipe_ = std::move(dummy_pipe.handle0); |
} else { |
CancelWait(); |
} |