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

Unified Diff: chrome/browser/profiles/profile_io_data.cc

Issue 2608103002: Remove ScopedVector from URLRequestInterceptorScopedVector. (Closed)
Patch Set: aw Created 3 years, 12 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
« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.cc ('k') | chromecast/browser/url_request_context_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_io_data.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
index e24a0ed98b6b5a7ed0316555a30929c46e590343..757222be67e98dbfe60a7956c522714a8939c72c 100644
--- a/chrome/browser/profiles/profile_io_data.cc
+++ b/chrome/browser/profiles/profile_io_data.cc
@@ -1099,7 +1099,7 @@ void ProfileIOData::Init(
// Install the New Tab Page Interceptor.
if (profile_params_->new_tab_page_interceptor.get()) {
request_interceptors.push_back(
- profile_params_->new_tab_page_interceptor.release());
+ std::move(profile_params_->new_tab_page_interceptor));
}
std::unique_ptr<net::MultiLogCTVerifier> ct_verifier(
@@ -1196,14 +1196,12 @@ ProfileIOData::SetUpJobFactoryDefaults(
// Set up interceptors in the reverse order.
std::unique_ptr<net::URLRequestJobFactory> top_job_factory =
std::move(job_factory);
- for (content::URLRequestInterceptorScopedVector::reverse_iterator i =
- request_interceptors.rbegin();
- i != request_interceptors.rend();
+ for (auto i = request_interceptors.rbegin(); i != request_interceptors.rend();
++i) {
top_job_factory.reset(new net::URLRequestInterceptingJobFactory(
- std::move(top_job_factory), base::WrapUnique(*i)));
+ std::move(top_job_factory), std::move(*i)));
}
- request_interceptors.weak_clear();
+ request_interceptors.clear();
if (protocol_handler_interceptor) {
protocol_handler_interceptor->Chain(std::move(top_job_factory));
« no previous file with comments | « chrome/browser/profiles/profile_impl_io_data.cc ('k') | chromecast/browser/url_request_context_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698