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

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

Issue 1811283004: Remove NetworkDelegate from HttpNetworkSession. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Response to comments Created 4 years, 9 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
« no previous file with comments | « google_apis/gcm/tools/mcs_probe.cc ('k') | ios/crnet/crnet_environment.mm » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/single_thread_task_runner.h" 9 #include "base/single_thread_task_runner.h"
10 #include "base/threading/worker_pool.h" 10 #include "base/threading/worker_pool.h"
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 network_session_params.transport_security_state = 148 network_session_params.transport_security_state =
149 url_request_context_->transport_security_state(); 149 url_request_context_->transport_security_state();
150 network_session_params.channel_id_service = 150 network_session_params.channel_id_service =
151 url_request_context_->channel_id_service(); 151 url_request_context_->channel_id_service();
152 network_session_params.proxy_service = 152 network_session_params.proxy_service =
153 url_request_context_->proxy_service(); 153 url_request_context_->proxy_service();
154 network_session_params.ssl_config_service = 154 network_session_params.ssl_config_service =
155 url_request_context_->ssl_config_service(); 155 url_request_context_->ssl_config_service();
156 network_session_params.http_auth_handler_factory = 156 network_session_params.http_auth_handler_factory =
157 url_request_context_->http_auth_handler_factory(); 157 url_request_context_->http_auth_handler_factory();
158 network_session_params.network_delegate = network_delegate_.get();
159 network_session_params.http_server_properties = 158 network_session_params.http_server_properties =
160 url_request_context_->http_server_properties(); 159 url_request_context_->http_server_properties();
161 network_session_params.net_log = url_request_context_->net_log(); 160 network_session_params.net_log = url_request_context_->net_log();
162 network_session_params.ignore_certificate_errors = 161 network_session_params.ignore_certificate_errors =
163 ignore_certificate_errors_; 162 ignore_certificate_errors_;
164 if (command_line.HasSwitch(switches::kHostResolverRules)) { 163 if (command_line.HasSwitch(switches::kHostResolverRules)) {
165 scoped_ptr<net::MappedHostResolver> mapped_host_resolver( 164 scoped_ptr<net::MappedHostResolver> mapped_host_resolver(
166 new net::MappedHostResolver(std::move(host_resolver))); 165 new net::MappedHostResolver(std::move(host_resolver)));
167 mapped_host_resolver->SetRulesFromString( 166 mapped_host_resolver->SetRulesFromString(
168 command_line.GetSwitchValueASCII(switches::kHostResolverRules)); 167 command_line.GetSwitchValueASCII(switches::kHostResolverRules));
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
216 HeadlessURLRequestContextGetter::GetNetworkTaskRunner() const { 215 HeadlessURLRequestContextGetter::GetNetworkTaskRunner() const {
217 return content::BrowserThread::GetMessageLoopProxyForThread( 216 return content::BrowserThread::GetMessageLoopProxyForThread(
218 content::BrowserThread::IO); 217 content::BrowserThread::IO);
219 } 218 }
220 219
221 net::HostResolver* HeadlessURLRequestContextGetter::host_resolver() const { 220 net::HostResolver* HeadlessURLRequestContextGetter::host_resolver() const {
222 return url_request_context_->host_resolver(); 221 return url_request_context_->host_resolver();
223 } 222 }
224 223
225 } // namespace headless 224 } // namespace headless
OLDNEW
« no previous file with comments | « google_apis/gcm/tools/mcs_probe.cc ('k') | ios/crnet/crnet_environment.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698