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 438 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
449 // Add an observer that will emit network change events to the ChromeNetLog. | 449 // Add an observer that will emit network change events to the ChromeNetLog. |
450 // Assuming NetworkChangeNotifier dispatches in FIFO order, we should be | 450 // Assuming NetworkChangeNotifier dispatches in FIFO order, we should be |
451 // logging the network change before other IO thread consumers respond to it. | 451 // logging the network change before other IO thread consumers respond to it. |
452 network_change_observer_.reset( | 452 network_change_observer_.reset( |
453 new LoggingNetworkChangeObserver(net_log_)); | 453 new LoggingNetworkChangeObserver(net_log_)); |
454 | 454 |
455 globals_->extension_event_router_forwarder = | 455 globals_->extension_event_router_forwarder = |
456 extension_event_router_forwarder_; | 456 extension_event_router_forwarder_; |
457 globals_->system_network_delegate.reset(new ChromeNetworkDelegate( | 457 globals_->system_network_delegate.reset(new ChromeNetworkDelegate( |
458 extension_event_router_forwarder_, | 458 extension_event_router_forwarder_, |
| 459 NULL, |
459 Profile::kInvalidProfileId, | 460 Profile::kInvalidProfileId, |
460 &system_enable_referrers_)); | 461 &system_enable_referrers_)); |
461 globals_->host_resolver.reset( | 462 globals_->host_resolver.reset( |
462 CreateGlobalHostResolver(net_log_)); | 463 CreateGlobalHostResolver(net_log_)); |
463 globals_->cert_verifier.reset(new net::CertVerifier); | 464 globals_->cert_verifier.reset(new net::CertVerifier); |
464 globals_->dnsrr_resolver.reset(new net::DnsRRResolver); | 465 globals_->dnsrr_resolver.reset(new net::DnsRRResolver); |
465 globals_->ssl_config_service = GetSSLConfigService(); | 466 globals_->ssl_config_service = GetSSLConfigService(); |
466 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( | 467 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( |
467 globals_->host_resolver.get())); | 468 globals_->host_resolver.get())); |
468 // For the ProxyScriptFetcher, we use a direct ProxyService. | 469 // For the ProxyScriptFetcher, we use a direct ProxyService. |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
691 system_params.network_delegate = globals_->system_network_delegate.get(); | 692 system_params.network_delegate = globals_->system_network_delegate.get(); |
692 system_params.net_log = net_log_; | 693 system_params.net_log = net_log_; |
693 globals_->system_http_transaction_factory.reset( | 694 globals_->system_http_transaction_factory.reset( |
694 new net::HttpNetworkLayer( | 695 new net::HttpNetworkLayer( |
695 new net::HttpNetworkSession(system_params))); | 696 new net::HttpNetworkSession(system_params))); |
696 globals_->system_ftp_transaction_factory.reset( | 697 globals_->system_ftp_transaction_factory.reset( |
697 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 698 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
698 globals_->system_request_context = | 699 globals_->system_request_context = |
699 ConstructSystemRequestContext(globals_, net_log_); | 700 ConstructSystemRequestContext(globals_, net_log_); |
700 } | 701 } |
OLD | NEW |