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

Unified Diff: net/test/embedded_test_server/embedded_test_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
Index: net/test/embedded_test_server/embedded_test_server.cc
diff --git a/net/test/embedded_test_server/embedded_test_server.cc b/net/test/embedded_test_server/embedded_test_server.cc
index bc401c92389952ec0aa53f67a8cb601e2c3bcfda..6cf6895342016b92e17f6ea5d61226c84f345beb 100644
--- a/net/test/embedded_test_server/embedded_test_server.cc
+++ b/net/test/embedded_test_server/embedded_test_server.cc
@@ -4,6 +4,8 @@
#include "net/test/embedded_test_server/embedded_test_server.h"
+#include <utility>
+
#include "base/bind.h"
#include "base/files/file_path.h"
#include "base/files/file_util.h"
@@ -166,7 +168,7 @@ void EmbeddedTestServer::HandleRequest(HttpConnection* connection,
<< request->relative_url;
scoped_ptr<BasicHttpResponse> not_found_response(new BasicHttpResponse);
not_found_response->set_code(HTTP_NOT_FOUND);
- response = not_found_response.Pass();
+ response = std::move(not_found_response);
}
response->SendResponse(
@@ -290,7 +292,7 @@ scoped_ptr<StreamSocket> EmbeddedTestServer::DoSSLUpgrade(
scoped_ptr<crypto::RSAPrivateKey> server_key(
crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(key_vector));
- return CreateSSLServerSocket(connection.Pass(), GetCertificate().get(),
+ return CreateSSLServerSocket(std::move(connection), GetCertificate().get(),
server_key.get(), ssl_config_);
}
@@ -302,13 +304,13 @@ void EmbeddedTestServer::DoAcceptLoop() {
base::Unretained(this)));
if (rv == ERR_IO_PENDING)
return;
- HandleAcceptResult(accepted_socket_.Pass());
+ HandleAcceptResult(std::move(accepted_socket_));
}
}
void EmbeddedTestServer::OnAcceptCompleted(int rv) {
DCHECK_NE(ERR_IO_PENDING, rv);
- HandleAcceptResult(accepted_socket_.Pass());
+ HandleAcceptResult(std::move(accepted_socket_));
DoAcceptLoop();
}
@@ -325,10 +327,10 @@ void EmbeddedTestServer::HandleAcceptResult(scoped_ptr<StreamSocket> socket) {
connection_listener_->AcceptedSocket(*socket);
if (is_using_ssl_)
- socket = DoSSLUpgrade(socket.Pass());
+ socket = DoSSLUpgrade(std::move(socket));
HttpConnection* http_connection = new HttpConnection(
- socket.Pass(),
+ std::move(socket),
base::Bind(&EmbeddedTestServer::HandleRequest, base::Unretained(this)));
connections_[http_connection->socket_.get()] = http_connection;
« no previous file with comments | « net/test/embedded_test_server/default_handlers.cc ('k') | net/test/embedded_test_server/embedded_test_server_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698