OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "chrome/browser/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/leak_tracker.h" | 10 #include "base/debug/leak_tracker.h" |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
253 globals->http_auth_handler_factory.get()); | 253 globals->http_auth_handler_factory.get()); |
254 context->set_proxy_service(globals->proxy_script_fetcher_proxy_service.get()); | 254 context->set_proxy_service(globals->proxy_script_fetcher_proxy_service.get()); |
255 context->set_http_transaction_factory( | 255 context->set_http_transaction_factory( |
256 globals->proxy_script_fetcher_http_transaction_factory.get()); | 256 globals->proxy_script_fetcher_http_transaction_factory.get()); |
257 context->set_ftp_transaction_factory( | 257 context->set_ftp_transaction_factory( |
258 globals->proxy_script_fetcher_ftp_transaction_factory.get()); | 258 globals->proxy_script_fetcher_ftp_transaction_factory.get()); |
259 context->set_cookie_store(globals->system_cookie_store.get()); | 259 context->set_cookie_store(globals->system_cookie_store.get()); |
260 context->set_origin_bound_cert_service( | 260 context->set_origin_bound_cert_service( |
261 globals->system_origin_bound_cert_service.get()); | 261 globals->system_origin_bound_cert_service.get()); |
262 context->set_network_delegate(globals->system_network_delegate.get()); | 262 context->set_network_delegate(globals->system_network_delegate.get()); |
| 263 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
| 264 // system URLRequestContext too. There's no reason this should be tied to a |
| 265 // profile. |
263 return context; | 266 return context; |
264 } | 267 } |
265 | 268 |
266 scoped_refptr<net::URLRequestContext> | 269 scoped_refptr<net::URLRequestContext> |
267 ConstructSystemRequestContext(IOThread::Globals* globals, | 270 ConstructSystemRequestContext(IOThread::Globals* globals, |
268 net::NetLog* net_log) { | 271 net::NetLog* net_log) { |
269 scoped_refptr<net::URLRequestContext> context( | 272 scoped_refptr<net::URLRequestContext> context( |
270 new SystemURLRequestContext); | 273 new SystemURLRequestContext); |
271 context->set_net_log(net_log); | 274 context->set_net_log(net_log); |
272 context->set_host_resolver(globals->host_resolver.get()); | 275 context->set_host_resolver(globals->host_resolver.get()); |
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
446 net::HttpNetworkSession::Params session_params; | 449 net::HttpNetworkSession::Params session_params; |
447 session_params.host_resolver = globals_->host_resolver.get(); | 450 session_params.host_resolver = globals_->host_resolver.get(); |
448 session_params.cert_verifier = globals_->cert_verifier.get(); | 451 session_params.cert_verifier = globals_->cert_verifier.get(); |
449 session_params.origin_bound_cert_service = | 452 session_params.origin_bound_cert_service = |
450 globals_->system_origin_bound_cert_service.get(); | 453 globals_->system_origin_bound_cert_service.get(); |
451 session_params.proxy_service = | 454 session_params.proxy_service = |
452 globals_->proxy_script_fetcher_proxy_service.get(); | 455 globals_->proxy_script_fetcher_proxy_service.get(); |
453 session_params.http_auth_handler_factory = | 456 session_params.http_auth_handler_factory = |
454 globals_->http_auth_handler_factory.get(); | 457 globals_->http_auth_handler_factory.get(); |
455 session_params.network_delegate = globals_->system_network_delegate.get(); | 458 session_params.network_delegate = globals_->system_network_delegate.get(); |
| 459 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
| 460 // system URLRequestContext too. There's no reason this should be tied to a |
| 461 // profile. |
456 session_params.net_log = net_log_; | 462 session_params.net_log = net_log_; |
457 session_params.ssl_config_service = globals_->ssl_config_service; | 463 session_params.ssl_config_service = globals_->ssl_config_service; |
458 scoped_refptr<net::HttpNetworkSession> network_session( | 464 scoped_refptr<net::HttpNetworkSession> network_session( |
459 new net::HttpNetworkSession(session_params)); | 465 new net::HttpNetworkSession(session_params)); |
460 globals_->proxy_script_fetcher_http_transaction_factory.reset( | 466 globals_->proxy_script_fetcher_http_transaction_factory.reset( |
461 new net::HttpNetworkLayer(network_session)); | 467 new net::HttpNetworkLayer(network_session)); |
462 globals_->proxy_script_fetcher_ftp_transaction_factory.reset( | 468 globals_->proxy_script_fetcher_ftp_transaction_factory.reset( |
463 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 469 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
464 | 470 |
465 globals_->proxy_script_fetcher_context = | 471 globals_->proxy_script_fetcher_context = |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
614 system_params.network_delegate = globals_->system_network_delegate.get(); | 620 system_params.network_delegate = globals_->system_network_delegate.get(); |
615 system_params.net_log = net_log_; | 621 system_params.net_log = net_log_; |
616 globals_->system_http_transaction_factory.reset( | 622 globals_->system_http_transaction_factory.reset( |
617 new net::HttpNetworkLayer( | 623 new net::HttpNetworkLayer( |
618 new net::HttpNetworkSession(system_params))); | 624 new net::HttpNetworkSession(system_params))); |
619 globals_->system_ftp_transaction_factory.reset( | 625 globals_->system_ftp_transaction_factory.reset( |
620 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 626 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
621 globals_->system_request_context = | 627 globals_->system_request_context = |
622 ConstructSystemRequestContext(globals_, net_log_); | 628 ConstructSystemRequestContext(globals_, net_log_); |
623 } | 629 } |
OLD | NEW |