Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(662)

Unified Diff: tools/android/forwarder2/forwarder.cc

Issue 1555613002: Convert Pass()→std::move() in //tools/android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/android/forwarder2/device_listener.cc ('k') | tools/android/forwarder2/forwarders_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « tools/android/forwarder2/device_listener.cc ('k') | tools/android/forwarder2/forwarders_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698