Convert Pass()→std::move() in //net

BUG=557422 R=avi@chromium.org TBR=gavinp@chromium.org Review URL: https://codereview.chromium.org/1545233002 Cr-Commit-Position: refs/heads/master@{#366889}
author: dcheng <dcheng@chromium.org> 2015-12-25 19:56:48 -0800
committer: Commit bot <commit-bot@chromium.org> 2015-12-26 03:57:46 +0000
commit: c7eeda42aff650547a3da73b0e0f6ab3f9b0ef13 (patch)
tree: 40b0bcb9cc341020cebfc29b2bcce331b034f5b3 /net/test
parent: 09487931ca01d32ab254555b29c51d648f45be3c (diff)
download: chromium_src-c7eeda42aff650547a3da73b0e0f6ab3f9b0ef13.zip
chromium_src-c7eeda42aff650547a3da73b0e0f6ab3f9b0ef13.tar.gz
chromium_src-c7eeda42aff650547a3da73b0e0f6ab3f9b0ef13.tar.bz2
7 files changed, 49 insertions, 40 deletions
diff --git a/net/test/embedded_test_server/default_handlers.cc b/net/test/embedded_test_server/default_handlers.cc
index f2e1acc..039ac3c 100644
--- a/net/test/embedded_test_server/default_handlers.cc
+++ b/net/test/embedded_test_server/default_handlers.cc
@@ -9,6 +9,7 @@
 #include <map>
 #include <sstream>
 #include <string>
+#include <utility>
 
 #include "base/base64.h"
 #include "base/files/file_path.h"
@@ -53,7 +54,7 @@ scoped_ptr<HttpResponse> HandleDefaultConnect(const HttpRequest& request) {
   http_response->set_content(
       "Your client has issued a malformed or illegal request.");
   http_response->set_content_type("text/html");
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /cachetime
@@ -64,7 +65,7 @@ scoped_ptr<HttpResponse> HandleCacheTime(const HttpRequest& request) {
       "<html><head><title>Cache: max-age=60</title></head></html>");
   http_response->set_content_type("text/html");
   http_response->AddCustomHeader("Cache-Control", "max-age=60");
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /echoheader | /echoheadercache
@@ -90,7 +91,7 @@ scoped_ptr<HttpResponse> HandleEchoHeader(const std::string& url,
 
   http_response->set_content_type("text/plain");
   http_response->AddCustomHeader("Cache-Control", cache_control);
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /echo?status=STATUS
@@ -112,7 +113,7 @@ scoped_ptr<HttpResponse> HandleEcho(const HttpRequest& request) {
     http_response->set_content("Echo");
   else
     http_response->set_content(request.content);
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /echotitle
@@ -122,7 +123,7 @@ scoped_ptr<HttpResponse> HandleEchoTitle(const HttpRequest& request) {
   http_response->set_content_type("text/html");
   http_response->set_content("<html><head><title>" + request.content +
                              "</title></head></html>");
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /echoall?QUERY
@@ -154,7 +155,7 @@ scoped_ptr<HttpResponse> HandleEchoAll(const HttpRequest& request) {
 
   http_response->set_content_type("text/html");
   http_response->set_content(body);
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /set-cookie?COOKIES
@@ -174,7 +175,7 @@ scoped_ptr<HttpResponse> HandleSetCookie(const HttpRequest& request) {
   }
 
   http_response->set_content(content);
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /set-many-cookies?N
@@ -195,7 +196,7 @@ scoped_ptr<HttpResponse> HandleSetManyCookies(const HttpRequest& request) {
 
   http_response->set_content(
       base::StringPrintf("%" PRIuS " cookies were sent", num));
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /expect-and-set-cookie?expect=EXPECTED&set=SET&data=DATA
@@ -239,7 +240,7 @@ scoped_ptr<HttpResponse> HandleExpectAndSetCookie(const HttpRequest& request) {
   }
 
   http_response->set_content(content);
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /set-header?HEADERS
@@ -265,7 +266,7 @@ scoped_ptr<HttpResponse> HandleSetHeader(const HttpRequest& request) {
   }
 
   http_response->set_content(content);
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /nocontent
@@ -273,14 +274,14 @@ scoped_ptr<HttpResponse> HandleSetHeader(const HttpRequest& request) {
 scoped_ptr<HttpResponse> HandleNoContent(const HttpRequest& request) {
   scoped_ptr<BasicHttpResponse> http_response(new BasicHttpResponse);
   http_response->set_code(HTTP_NO_CONTENT);
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /close-socket
 // Immediately closes the connection.
 scoped_ptr<HttpResponse> HandleCloseSocket(const HttpRequest& request) {
   scoped_ptr<RawHttpResponse> http_response(new RawHttpResponse("", ""));
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /auth-basic?password=PASS&realm=REALM
@@ -341,13 +342,13 @@ scoped_ptr<HttpResponse> HandleAuthBasic(const HttpRequest& request) {
         "password: %s<p>You sent:<br>%s<p></body></html>",
         error.c_str(), auth.c_str(), b64str.c_str(), username.c_str(),
         userpass.c_str(), password.c_str(), request.all_headers.c_str()));
-    return http_response.Pass();
+    return std::move(http_response);
   }
 
   if (request.headers.find("If-None-Match") != request.headers.end() &&
       request.headers.at("If-None-Match") == kEtag) {
     http_response->set_code(HTTP_NOT_MODIFIED);
-    return http_response.Pass();
+    return std::move(http_response);
   }
 
   base::FilePath file_path =
@@ -371,7 +372,7 @@ scoped_ptr<HttpResponse> HandleAuthBasic(const HttpRequest& request) {
 
   http_response->AddCustomHeader("Cache-Control", "max-age=60000");
   http_response->AddCustomHeader("Etag", kEtag);
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /auth-digest
@@ -460,7 +461,7 @@ scoped_ptr<HttpResponse> HandleAuthDigest(const HttpRequest& request) {
         "You sent:<br>%s<p>We are replying:<br>%s<p></body></html>",
         error.c_str(), auth.c_str(), request.all_headers.c_str(),
         auth_header.c_str()));
-    return http_response.Pass();
+    return std::move(http_response);
   }
 
   http_response->set_content_type("text/html");
@@ -469,7 +470,7 @@ scoped_ptr<HttpResponse> HandleAuthDigest(const HttpRequest& request) {
                          "<body>auth=%s<p></body></html>",
                          username.c_str(), password.c_str(), auth.c_str()));
 
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /server-redirect?URL
@@ -486,7 +487,7 @@ scoped_ptr<HttpResponse> HandleServerRedirect(const HttpRequest& request) {
   http_response->set_content(base::StringPrintf(
       "<html><head></head><body>Redirecting to %s</body></html>",
       dest.c_str()));
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /cross-site?URL
@@ -515,7 +516,7 @@ scoped_ptr<HttpResponse> HandleCrossSiteRedirect(EmbeddedTestServer* server,
   http_response->set_content(base::StringPrintf(
       "<html><head></head><body>Redirecting to %s</body></html>",
       dest.c_str()));
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /client-redirect?URL
@@ -531,7 +532,7 @@ scoped_ptr<HttpResponse> HandleClientRedirect(const HttpRequest& request) {
       "<html><head><meta http-equiv=\"refresh\" content=\"0;url=%s\"></head>"
       "<body>Redirecting to %s</body></html>",
       dest.c_str(), dest.c_str()));
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // /defaultresponse
@@ -541,7 +542,7 @@ scoped_ptr<HttpResponse> HandleDefaultResponse(const HttpRequest& request) {
   http_response->set_content_type("text/html");
   http_response->set_content("Default response given for path: " +
                              request.relative_url);
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 // Delays |delay| seconds before sending a response to the client.
@@ -574,7 +575,7 @@ scoped_ptr<HttpResponse> HandleSlowServer(const HttpRequest& request) {
   scoped_ptr<BasicHttpResponse> http_response(new DelayedHttpResponse(delay));
   http_response->set_content_type("text/plain");
   http_response->set_content(base::StringPrintf("waited %.1f seconds", delay));
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 }  // namespace anonymous
diff --git a/net/test/embedded_test_server/embedded_test_server.cc b/net/test/embedded_test_server/embedded_test_server.cc
index bc401c9..6cf6895 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;
 
diff --git a/net/test/embedded_test_server/embedded_test_server_unittest.cc b/net/test/embedded_test_server/embedded_test_server_unittest.cc
index 03061e4..a08d3b7 100644
--- a/net/test/embedded_test_server/embedded_test_server_unittest.cc
+++ b/net/test/embedded_test_server/embedded_test_server_unittest.cc
@@ -4,6 +4,8 @@
 
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
+#include <utility>
+
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/path_service.h"
@@ -178,7 +180,7 @@ class EmbeddedTestServerTest
       http_response->set_code(code);
       http_response->set_content(content);
       http_response->set_content_type(content_type);
-      return http_response.Pass();
+      return std::move(http_response);
     }
 
     return nullptr;
diff --git a/net/test/embedded_test_server/http_connection.cc b/net/test/embedded_test_server/http_connection.cc
index 5fc39ba..ce95f43 100644
--- a/net/test/embedded_test_server/http_connection.cc
+++ b/net/test/embedded_test_server/http_connection.cc
@@ -4,6 +4,8 @@
 
 #include "net/test/embedded_test_server/http_connection.h"
 
+#include <utility>
+
 #include "net/base/net_errors.h"
 #include "net/socket/stream_socket.h"
 
@@ -12,7 +14,7 @@ namespace test_server {
 
 HttpConnection::HttpConnection(scoped_ptr<StreamSocket> socket,
                                const HandleRequestCallback& callback)
-    : socket_(socket.Pass()),
+    : socket_(std::move(socket)),
       callback_(callback),
       read_buf_(new IOBufferWithSize(4096)),
       weak_factory_(this) {}
diff --git a/net/test/embedded_test_server/http_request.cc b/net/test/embedded_test_server/http_request.cc
index 23a4f92..b5b2e4f 100644
--- a/net/test/embedded_test_server/http_request.cc
+++ b/net/test/embedded_test_server/http_request.cc
@@ -5,11 +5,12 @@
 #include "net/test/embedded_test_server/http_request.h"
 
 #include <algorithm>
+#include <utility>
 
 #include "base/logging.h"
-#include "base/strings/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
 #include "net/http/http_chunked_decoder.h"
 #include "url/gurl.h"
 
@@ -216,7 +217,7 @@ HttpRequestParser::ParseResult HttpRequestParser::ParseContent() {
 
 scoped_ptr<HttpRequest> HttpRequestParser::GetRequest() {
   DCHECK_EQ(STATE_ACCEPTED, state_);
-  scoped_ptr<HttpRequest> result = http_request_.Pass();
+  scoped_ptr<HttpRequest> result = std::move(http_request_);
 
   // Prepare for parsing a new request.
   state_ = STATE_HEADERS;
@@ -225,7 +226,7 @@ scoped_ptr<HttpRequest> HttpRequestParser::GetRequest() {
   buffer_position_ = 0;
   declared_content_length_ = 0;
 
-  return result.Pass();
+  return result;
 }
 
 HttpMethod HttpRequestParser::GetMethodType(const std::string& token) const {
diff --git a/net/test/embedded_test_server/request_handler_util.cc b/net/test/embedded_test_server/request_handler_util.cc
index aacfcc5..ab3e975 100644
--- a/net/test/embedded_test_server/request_handler_util.cc
+++ b/net/test/embedded_test_server/request_handler_util.cc
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <ctime>
 #include <sstream>
+#include <utility>
 
 #include "base/base64.h"
 #include "base/files/file_util.h"
@@ -139,19 +140,19 @@ scoped_ptr<HttpResponse> HandleFileRequest(const base::FilePath& server_root,
   if (query.find("expected_body") != query.end()) {
     if (request.content.find(query["expected_body"].front()) ==
         std::string::npos) {
-      return failed_response.Pass();
+      return std::move(failed_response);
     }
   }
 
   if (query.find("expected_headers") != query.end()) {
     for (const auto& header : query["expected_headers"]) {
       if (header.find(":") == std::string::npos)
-        return failed_response.Pass();
+        return std::move(failed_response);
       std::string key = header.substr(0, header.find(":"));
       std::string value = header.substr(header.find(":") + 1);
       if (request.headers.find(key) == request.headers.end() ||
           request.headers.at(key) != value) {
-        return failed_response.Pass();
+        return std::move(failed_response);
       }
     }
   }
@@ -173,7 +174,7 @@ scoped_ptr<HttpResponse> HandleFileRequest(const base::FilePath& server_root,
   if (query.find("replace_text") != query.end()) {
     for (const auto& replacement : query["replace_text"]) {
       if (replacement.find(":") == std::string::npos)
-        return failed_response.Pass();
+        return std::move(failed_response);
       std::string find;
       std::string with;
       base::Base64Decode(replacement.substr(0, replacement.find(":")), &find);
@@ -221,7 +222,7 @@ scoped_ptr<HttpResponse> HandleFileRequest(const base::FilePath& server_root,
   http_response->AddCustomHeader("Accept-Ranges", "bytes");
   http_response->AddCustomHeader("ETag", "'" + file_path.MaybeAsASCII() + "'");
   http_response->set_content(file_contents);
-  return http_response.Pass();
+  return std::move(http_response);
 }
 
 }  // namespace test_server
diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc
index f45ef4a..e69233e 100644
--- a/net/test/spawned_test_server/base_test_server.cc
+++ b/net/test/spawned_test_server/base_test_server.cc
@@ -5,9 +5,9 @@
 #include "net/test/spawned_test_server/base_test_server.h"
 
 #include <stdint.h>
-
 #include <limits>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/base64.h"
@@ -560,7 +560,7 @@ bool BaseTestServer::GenerateArguments(base::DictionaryValue* arguments) const {
       for (const std::string& proto : ssl_options_.npn_protocols) {
         npn_protocols->Append(new base::StringValue(proto));
       }
-      arguments->Set("npn-protocols", npn_protocols.Pass());
+      arguments->Set("npn-protocols", std::move(npn_protocols));
     }
     if (ssl_options_.alert_after_handshake)
       arguments->Set("alert-after-handshake", base::Value::CreateNullValue());
author	dcheng <dcheng@chromium.org>	2015-12-25 19:56:48 -0800
committer	Commit bot <commit-bot@chromium.org>	2015-12-26 03:57:46 +0000
commit	c7eeda42aff650547a3da73b0e0f6ab3f9b0ef13 (patch)
tree	40b0bcb9cc341020cebfc29b2bcce331b034f5b3 /net/test
parent	09487931ca01d32ab254555b29c51d648f45be3c (diff)
download	chromium_src-c7eeda42aff650547a3da73b0e0f6ab3f9b0ef13.zip chromium_src-c7eeda42aff650547a3da73b0e0f6ab3f9b0ef13.tar.gz chromium_src-c7eeda42aff650547a3da73b0e0f6ab3f9b0ef13.tar.bz2