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

Side by Side Diff: headless/lib/browser/headless_url_request_context_getter.cc

Issue 2608103002: Remove ScopedVector from URLRequestInterceptorScopedVector. (Closed)
Patch Set: aw Created 3 years, 11 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "headless/lib/browser/headless_url_request_context_getter.h" 5 #include "headless/lib/browser/headless_url_request_context_getter.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 new net::MappedHostResolver(std::move(host_resolver))); 81 new net::MappedHostResolver(std::move(host_resolver)));
82 mapped_host_resolver->SetRulesFromString(host_resolver_rules_); 82 mapped_host_resolver->SetRulesFromString(host_resolver_rules_);
83 builder.set_host_resolver(std::move(mapped_host_resolver)); 83 builder.set_host_resolver(std::move(mapped_host_resolver));
84 } 84 }
85 85
86 for (auto& pair : protocol_handlers_) { 86 for (auto& pair : protocol_handlers_) {
87 builder.SetProtocolHandler(pair.first, 87 builder.SetProtocolHandler(pair.first,
88 base::WrapUnique(pair.second.release())); 88 base::WrapUnique(pair.second.release()));
89 } 89 }
90 protocol_handlers_.clear(); 90 protocol_handlers_.clear();
91 91 builder.SetInterceptors(std::move(request_interceptors_));
92 std::vector<std::unique_ptr<net::URLRequestInterceptor>>
93 request_interceptors;
94 for (auto it : request_interceptors_) {
95 request_interceptors.push_back(base::WrapUnique(it));
96 }
97 request_interceptors_.weak_clear();
98 builder.SetInterceptors(std::move(request_interceptors));
99 92
100 url_request_context_ = builder.Build(); 93 url_request_context_ = builder.Build();
101 } 94 }
102 95
103 return url_request_context_.get(); 96 return url_request_context_.get();
104 } 97 }
105 98
106 scoped_refptr<base::SingleThreadTaskRunner> 99 scoped_refptr<base::SingleThreadTaskRunner>
107 HeadlessURLRequestContextGetter::GetNetworkTaskRunner() const { 100 HeadlessURLRequestContextGetter::GetNetworkTaskRunner() const {
108 return content::BrowserThread::GetTaskRunnerForThread( 101 return content::BrowserThread::GetTaskRunnerForThread(
109 content::BrowserThread::IO); 102 content::BrowserThread::IO);
110 } 103 }
111 104
112 net::HostResolver* HeadlessURLRequestContextGetter::host_resolver() const { 105 net::HostResolver* HeadlessURLRequestContextGetter::host_resolver() const {
113 return url_request_context_->host_resolver(); 106 return url_request_context_->host_resolver();
114 } 107 }
115 108
116 } // namespace headless 109 } // namespace headless
OLDNEW
« no previous file with comments | « content/shell/browser/shell_url_request_context_getter.cc ('k') | ios/chrome/browser/browser_state/chrome_browser_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698