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

Unified Diff: tools/android/forwarder2/daemon.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 | « no previous file | tools/android/forwarder2/device_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/android/forwarder2/daemon.cc
diff --git a/tools/android/forwarder2/daemon.cc b/tools/android/forwarder2/daemon.cc
index f362735be0d080d9a186e3783f91a889e9793c1b..e5ebe07bbf5aefffa54cb64977b9c665d474113a 100644
--- a/tools/android/forwarder2/daemon.cc
+++ b/tools/android/forwarder2/daemon.cc
@@ -13,10 +13,10 @@
#include <sys/types.h>
#include <sys/wait.h>
#include <unistd.h>
-
#include <cstdlib>
#include <cstring>
#include <string>
+#include <utility>
#include "base/files/file_path.h"
#include "base/files/file_util.h"
@@ -67,7 +67,7 @@ bool RunServerAcceptLoop(const std::string& welcome_message,
failed = true;
continue;
}
- server_delegate->OnClientConnected(client_socket.Pass());
+ server_delegate->OnClientConnected(std::move(client_socket));
}
return !failed;
}
@@ -120,7 +120,7 @@ scoped_ptr<Socket> ConnectToUnixDomainSocket(
LOG(ERROR) << "Unexpected message read from daemon: " << buf;
break;
}
- return socket.Pass();
+ return socket;
}
return scoped_ptr<Socket>();
}
« no previous file with comments | « no previous file | tools/android/forwarder2/device_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698