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 443 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
454 // logging the network change before other IO thread consumers respond to it. | 454 // logging the network change before other IO thread consumers respond to it. |
455 network_change_observer_.reset( | 455 network_change_observer_.reset( |
456 new LoggingNetworkChangeObserver(net_log_)); | 456 new LoggingNetworkChangeObserver(net_log_)); |
457 | 457 |
458 globals_->extension_event_router_forwarder = | 458 globals_->extension_event_router_forwarder = |
459 extension_event_router_forwarder_; | 459 extension_event_router_forwarder_; |
460 globals_->system_network_delegate.reset(new ChromeNetworkDelegate( | 460 globals_->system_network_delegate.reset(new ChromeNetworkDelegate( |
461 extension_event_router_forwarder_, | 461 extension_event_router_forwarder_, |
462 NULL, | 462 NULL, |
463 NULL, | 463 NULL, |
| 464 NULL, |
464 &system_enable_referrers_)); | 465 &system_enable_referrers_)); |
465 globals_->host_resolver.reset( | 466 globals_->host_resolver.reset( |
466 CreateGlobalHostResolver(net_log_)); | 467 CreateGlobalHostResolver(net_log_)); |
467 globals_->cert_verifier.reset(new net::CertVerifier); | 468 globals_->cert_verifier.reset(new net::CertVerifier); |
468 globals_->dnsrr_resolver.reset(new net::DnsRRResolver); | 469 globals_->dnsrr_resolver.reset(new net::DnsRRResolver); |
469 globals_->ssl_config_service = GetSSLConfigService(); | 470 globals_->ssl_config_service = GetSSLConfigService(); |
470 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( | 471 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( |
471 globals_->host_resolver.get())); | 472 globals_->host_resolver.get())); |
472 // For the ProxyScriptFetcher, we use a direct ProxyService. | 473 // For the ProxyScriptFetcher, we use a direct ProxyService. |
473 globals_->proxy_script_fetcher_proxy_service.reset( | 474 globals_->proxy_script_fetcher_proxy_service.reset( |
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
703 system_params.network_delegate = globals_->system_network_delegate.get(); | 704 system_params.network_delegate = globals_->system_network_delegate.get(); |
704 system_params.net_log = net_log_; | 705 system_params.net_log = net_log_; |
705 globals_->system_http_transaction_factory.reset( | 706 globals_->system_http_transaction_factory.reset( |
706 new net::HttpNetworkLayer( | 707 new net::HttpNetworkLayer( |
707 new net::HttpNetworkSession(system_params))); | 708 new net::HttpNetworkSession(system_params))); |
708 globals_->system_ftp_transaction_factory.reset( | 709 globals_->system_ftp_transaction_factory.reset( |
709 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 710 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
710 globals_->system_request_context = | 711 globals_->system_request_context = |
711 ConstructSystemRequestContext(globals_, net_log_); | 712 ConstructSystemRequestContext(globals_, net_log_); |
712 } | 713 } |
OLD | NEW |