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

Side by Side Diff: content/shell/browser/shell_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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "content/shell/browser/shell_url_request_context_getter.h" 5 #include "content/shell/browser/shell_url_request_context_getter.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 network_session_params.transport_security_state = 164 network_session_params.transport_security_state =
165 url_request_context_->transport_security_state(); 165 url_request_context_->transport_security_state();
166 network_session_params.channel_id_service = 166 network_session_params.channel_id_service =
167 url_request_context_->channel_id_service(); 167 url_request_context_->channel_id_service();
168 network_session_params.proxy_service = 168 network_session_params.proxy_service =
169 url_request_context_->proxy_service(); 169 url_request_context_->proxy_service();
170 network_session_params.ssl_config_service = 170 network_session_params.ssl_config_service =
171 url_request_context_->ssl_config_service(); 171 url_request_context_->ssl_config_service();
172 network_session_params.http_auth_handler_factory = 172 network_session_params.http_auth_handler_factory =
173 url_request_context_->http_auth_handler_factory(); 173 url_request_context_->http_auth_handler_factory();
174 network_session_params.network_delegate =
175 network_delegate_.get();
176 network_session_params.http_server_properties = 174 network_session_params.http_server_properties =
177 url_request_context_->http_server_properties(); 175 url_request_context_->http_server_properties();
178 network_session_params.net_log = 176 network_session_params.net_log =
179 url_request_context_->net_log(); 177 url_request_context_->net_log();
180 network_session_params.ignore_certificate_errors = 178 network_session_params.ignore_certificate_errors =
181 ignore_certificate_errors_; 179 ignore_certificate_errors_;
182 if (command_line.HasSwitch(switches::kTestingFixedHttpPort)) { 180 if (command_line.HasSwitch(switches::kTestingFixedHttpPort)) {
183 int value; 181 int value;
184 base::StringToInt(command_line.GetSwitchValueASCII( 182 base::StringToInt(command_line.GetSwitchValueASCII(
185 switches::kTestingFixedHttpPort), &value); 183 switches::kTestingFixedHttpPort), &value);
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 scoped_refptr<base::SingleThreadTaskRunner> 246 scoped_refptr<base::SingleThreadTaskRunner>
249 ShellURLRequestContextGetter::GetNetworkTaskRunner() const { 247 ShellURLRequestContextGetter::GetNetworkTaskRunner() const {
250 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); 248 return BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
251 } 249 }
252 250
253 net::HostResolver* ShellURLRequestContextGetter::host_resolver() { 251 net::HostResolver* ShellURLRequestContextGetter::host_resolver() {
254 return url_request_context_->host_resolver(); 252 return url_request_context_->host_resolver();
255 } 253 }
256 254
257 } // namespace content 255 } // namespace content
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/net_internals/net_internals_ui.cc ('k') | google_apis/gcm/tools/mcs_probe.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698