Index: tools/android/forwarder2/forwarder.cc |
diff --git a/tools/android/forwarder2/forwarder.cc b/tools/android/forwarder2/forwarder.cc |
index 31fd8afc5a0ec93178264ae8ce6ad47a36e4b109..d717c9e8d3a9c8243a82f5247a0016bb513d22e9 100644 |
--- a/tools/android/forwarder2/forwarder.cc |
+++ b/tools/android/forwarder2/forwarder.cc |
@@ -4,6 +4,8 @@ |
#include "tools/android/forwarder2/forwarder.h" |
+#include <utility> |
+ |
#include "base/logging.h" |
#include "base/macros.h" |
#include "base/posix/eintr_wrapper.h" |
@@ -221,10 +223,9 @@ class Forwarder::BufferedCopier { |
DISALLOW_COPY_AND_ASSIGN(BufferedCopier); |
}; |
-Forwarder::Forwarder(scoped_ptr<Socket> socket1, |
- scoped_ptr<Socket> socket2) |
- : socket1_(socket1.Pass()), |
- socket2_(socket2.Pass()), |
+Forwarder::Forwarder(scoped_ptr<Socket> socket1, scoped_ptr<Socket> socket2) |
+ : socket1_(std::move(socket1)), |
+ socket2_(std::move(socket2)), |
buffer1_(new BufferedCopier(socket1_.get(), socket2_.get())), |
buffer2_(new BufferedCopier(socket2_.get(), socket1_.get())) { |
buffer1_->SetPeer(buffer2_.get()); |