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

Unified Diff: ios/web/net/request_tracker_impl_unittest.mm

Issue 1861593005: Convert //ios from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? Created 4 years, 8 months 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: ios/web/net/request_tracker_impl_unittest.mm
diff --git a/ios/web/net/request_tracker_impl_unittest.mm b/ios/web/net/request_tracker_impl_unittest.mm
index 2cc83a729193e5f4839248ff5f005cfdbcac4341..c3a5d05fbc7fca963ace481d45650db953a4a8e6 100644
--- a/ios/web/net/request_tracker_impl_unittest.mm
+++ b/ios/web/net/request_tracker_impl_unittest.mm
@@ -9,6 +9,7 @@
#include "base/logging.h"
#include "base/mac/scoped_nsobject.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/memory/scoped_vector.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/sys_string_conversions.h"
@@ -236,7 +237,7 @@ class RequestTrackerTest : public PlatformTest {
net::TestJobInterceptor* AddInterceptorToRequest(size_t i) {
// |interceptor| will be deleted from |job_factory_|'s destructor.
net::TestJobInterceptor* protocol_handler = new net::TestJobInterceptor();
- job_factory_.SetProtocolHandler("http", make_scoped_ptr(protocol_handler));
+ job_factory_.SetProtocolHandler("http", base::WrapUnique(protocol_handler));
contexts_[i]->set_job_factory(&job_factory_);
return protocol_handler;
}
@@ -440,7 +441,7 @@ TEST_F(RequestTrackerTest, CaptureHeaders) {
// TODO(mmenke): This is really bizarre. Do something more reasonable.
const_cast<net::HttpResponseInfo&>(request->response_info()).headers =
new net::HttpResponseHeaders(headers);
- scoped_ptr<net::URLRequestTestJob> job(new net::URLRequestTestJob(
+ std::unique_ptr<net::URLRequestTestJob> job(new net::URLRequestTestJob(
request, request->context()->network_delegate(), headers, "", false));
AddInterceptorToRequest(0)->set_main_intercept_job(std::move(job));
request->Start();
« no previous file with comments | « ios/web/net/crw_ssl_status_updater_unittest.mm ('k') | ios/web/net/web_http_protocol_handler_delegate_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698