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

Unified Diff: ios/chrome/browser/browser_state/chrome_browser_state_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 | « ios/chrome/browser/browser_state/chrome_browser_state.mm ('k') | ios/chrome/browser/net/net_types.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc
diff --git a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc
index e0625c16c7595153c3440f3a4f8f335b2befc546..10aba59b8c0343a84975fd26cce95531bf739029 100644
--- a/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc
+++ b/ios/chrome/browser/browser_state/chrome_browser_state_io_data.cc
@@ -416,13 +416,12 @@ ChromeBrowserStateIOData::SetUpJobFactoryDefaults(
// 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();
return top_job_factory;
}
« no previous file with comments | « ios/chrome/browser/browser_state/chrome_browser_state.mm ('k') | ios/chrome/browser/net/net_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698