Index: content/public/test/test_download_request_handler.cc |
diff --git a/content/public/test/test_download_request_handler.cc b/content/public/test/test_download_request_handler.cc |
index 620ebcaa3d9841f7157de3fbba07f6ec1cb8305b..e1d15b1a22dbba379d5a48e94f807421a6b36bb7 100644 |
--- a/content/public/test/test_download_request_handler.cc |
+++ b/content/public/test/test_download_request_handler.cc |
@@ -5,10 +5,12 @@ |
#include "content/public/test/test_download_request_handler.h" |
#include <inttypes.h> |
+ |
#include <utility> |
#include "base/logging.h" |
#include "base/macros.h" |
+#include "base/memory/ptr_util.h" |
#include "base/memory/weak_ptr.h" |
#include "base/run_loop.h" |
#include "base/sequenced_task_runner.h" |
@@ -107,7 +109,7 @@ class TestDownloadRequestHandler::PartialResponseJob |
int ReadRawData(net::IOBuffer* buf, int buf_size) override; |
private: |
- PartialResponseJob(scoped_ptr<Parameters> parameters, |
+ PartialResponseJob(std::unique_ptr<Parameters> parameters, |
base::WeakPtr<Interceptor> interceptor, |
net::URLRequest* url_request, |
net::NetworkDelegate* network_delegate); |
@@ -142,7 +144,7 @@ class TestDownloadRequestHandler::PartialResponseJob |
// re-entrancy. |
void NotifyHeadersCompleteAndPrepareToRead(); |
- scoped_ptr<Parameters> parameters_; |
+ std::unique_ptr<Parameters> parameters_; |
base::WeakPtr<Interceptor> interceptor_; |
net::HttpResponseInfo response_info_; |
@@ -205,12 +207,12 @@ net::URLRequestJob* TestDownloadRequestHandler::PartialResponseJob::Factory( |
net::URLRequest* request, |
net::NetworkDelegate* delegate, |
base::WeakPtr<Interceptor> interceptor) { |
- return new PartialResponseJob(make_scoped_ptr(new Parameters(parameters)), |
+ return new PartialResponseJob(base::WrapUnique(new Parameters(parameters)), |
interceptor, request, delegate); |
} |
TestDownloadRequestHandler::PartialResponseJob::PartialResponseJob( |
- scoped_ptr<Parameters> parameters, |
+ std::unique_ptr<Parameters> parameters, |
base::WeakPtr<Interceptor> interceptor, |
net::URLRequest* request, |
net::NetworkDelegate* network_delegate) |
@@ -485,7 +487,8 @@ TestDownloadRequestHandler::Interceptor::Register( |
const GURL& url, |
scoped_refptr<base::SequencedTaskRunner> client_task_runner) { |
DCHECK(url.is_valid()); |
- scoped_ptr<Interceptor> interceptor(new Interceptor(url, client_task_runner)); |
+ std::unique_ptr<Interceptor> interceptor( |
+ new Interceptor(url, client_task_runner)); |
base::WeakPtr<Interceptor> weak_reference = |
interceptor->weak_ptr_factory_.GetWeakPtr(); |
net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance(); |