Index: net/test/embedded_test_server/request_handler_util.cc |
diff --git a/net/test/embedded_test_server/request_handler_util.cc b/net/test/embedded_test_server/request_handler_util.cc |
index db3f3a6fa0f4d8f8352c76c0f92e774f8d6c69ba..b555578f2a00adde5771ee078e23e97fb0d3004c 100644 |
--- a/net/test/embedded_test_server/request_handler_util.cc |
+++ b/net/test/embedded_test_server/request_handler_util.cc |
@@ -5,6 +5,7 @@ |
#include "net/test/embedded_test_server/request_handler_util.h" |
#include <stdlib.h> |
+ |
#include <ctime> |
#include <sstream> |
#include <utility> |
@@ -12,6 +13,7 @@ |
#include "base/base64.h" |
#include "base/files/file_util.h" |
#include "base/format_macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/strings/string_util.h" |
#include "base/strings/stringprintf.h" |
#include "base/threading/thread_restrictions.h" |
@@ -75,7 +77,7 @@ bool ShouldHandle(const HttpRequest& request, const std::string& path_prefix) { |
base::CompareCase::SENSITIVE); |
} |
-scoped_ptr<HttpResponse> HandlePrefixedRequest( |
+std::unique_ptr<HttpResponse> HandlePrefixedRequest( |
const std::string& prefix, |
const EmbeddedTestServer::HandleRequestCallback& handler, |
const HttpRequest& request) { |
@@ -118,8 +120,9 @@ void GetFilePathWithReplacements(const std::string& original_file_path, |
} |
// Handles |request| by serving a file from under |server_root|. |
-scoped_ptr<HttpResponse> HandleFileRequest(const base::FilePath& server_root, |
- const HttpRequest& request) { |
+std::unique_ptr<HttpResponse> HandleFileRequest( |
+ const base::FilePath& server_root, |
+ const HttpRequest& request) { |
// This is a test-only server. Ignore I/O thread restrictions. |
// TODO(svaldez): Figure out why thread is I/O restricted in the first place. |
base::ThreadRestrictions::ScopedAllowIO allow_io; |
@@ -139,7 +142,7 @@ scoped_ptr<HttpResponse> HandleFileRequest(const base::FilePath& server_root, |
RequestQuery query = ParseQuery(request_url); |
- scoped_ptr<BasicHttpResponse> failed_response(new BasicHttpResponse); |
+ std::unique_ptr<BasicHttpResponse> failed_response(new BasicHttpResponse); |
failed_response->set_code(HTTP_NOT_FOUND); |
if (query.find("expected_body") != query.end()) { |
@@ -197,11 +200,11 @@ scoped_ptr<HttpResponse> HandleFileRequest(const base::FilePath& server_root, |
if (!base::ReadFileToString(headers_path, &headers_contents)) |
return nullptr; |
- return make_scoped_ptr( |
+ return base::WrapUnique( |
new RawHttpResponse(headers_contents, file_contents)); |
} |
- scoped_ptr<BasicHttpResponse> http_response(new BasicHttpResponse); |
+ std::unique_ptr<BasicHttpResponse> http_response(new BasicHttpResponse); |
http_response->set_code(HTTP_OK); |
if (request.headers.find("Range") != request.headers.end()) { |