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

Unified Diff: net/server/http_server.cc

Issue 1545233002: Convert Pass()→std::move() in //net (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 | « net/server/http_connection.cc ('k') | net/server/http_server_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/server/http_server.cc
diff --git a/net/server/http_server.cc b/net/server/http_server.cc
index d6c615ea16e45c342d1e412d9ed3fdbe330f5711..ab05af87ed869e7174971daa496d0cbfaf5cf8fb 100644
--- a/net/server/http_server.cc
+++ b/net/server/http_server.cc
@@ -4,6 +4,8 @@
#include "net/server/http_server.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/compiler_specific.h"
#include "base/location.h"
@@ -29,7 +31,7 @@ namespace net {
HttpServer::HttpServer(scoped_ptr<ServerSocket> server_socket,
HttpServer::Delegate* delegate)
- : server_socket_(server_socket.Pass()),
+ : server_socket_(std::move(server_socket)),
delegate_(delegate),
last_id_(0),
weak_ptr_factory_(this) {
@@ -159,7 +161,7 @@ int HttpServer::HandleAcceptResult(int rv) {
}
HttpConnection* connection =
- new HttpConnection(++last_id_, accepted_socket_.Pass());
+ new HttpConnection(++last_id_, std::move(accepted_socket_));
id_to_connection_[connection->id()] = connection;
delegate_->OnConnect(connection->id());
if (!HasClosedConnection(connection))
« no previous file with comments | « net/server/http_connection.cc ('k') | net/server/http_server_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698