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

Unified Diff: content/shell/browser/shell_url_request_context_getter.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
Index: content/shell/browser/shell_url_request_context_getter.cc
diff --git a/content/shell/browser/shell_url_request_context_getter.cc b/content/shell/browser/shell_url_request_context_getter.cc
index 1ea59e4740b1a29403d88b168ec9904a58540630..cfa2b6d82bd172bcbb4ea9fa25f6cbc7f4da3aa3 100644
--- a/content/shell/browser/shell_url_request_context_getter.cc
+++ b/content/shell/browser/shell_url_request_context_getter.cc
@@ -241,14 +241,12 @@ net::URLRequestContext* ShellURLRequestContextGetter::GetURLRequestContext() {
// Set up interceptors in the reverse order.
std::unique_ptr<net::URLRequestJobFactory> top_job_factory =
std::move(job_factory);
- for (URLRequestInterceptorScopedVector::reverse_iterator i =
- request_interceptors_.rbegin();
- i != request_interceptors_.rend();
- ++i) {
+ 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();
storage_->set_job_factory(std::move(top_job_factory));
}
« no previous file with comments | « content/public/browser/browser_context.h ('k') | headless/lib/browser/headless_url_request_context_getter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698