Index: net/test/embedded_test_server/http_request.cc |
diff --git a/net/test/embedded_test_server/http_request.cc b/net/test/embedded_test_server/http_request.cc |
index 23a4f9249aa21ed34b7792bcb6dc9a483627163a..b5b2e4f372dd16264143db67cea128e27eabd765 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 { |