| 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 406 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 417 | 417 |
| 418 // Add an observer that will emit network change events to the ChromeNetLog. | 418 // Add an observer that will emit network change events to the ChromeNetLog. |
| 419 // Assuming NetworkChangeNotifier dispatches in FIFO order, we should be | 419 // Assuming NetworkChangeNotifier dispatches in FIFO order, we should be |
| 420 // logging the network change before other IO thread consumers respond to it. | 420 // logging the network change before other IO thread consumers respond to it. |
| 421 network_change_observer_.reset( | 421 network_change_observer_.reset( |
| 422 new LoggingNetworkChangeObserver(net_log_)); | 422 new LoggingNetworkChangeObserver(net_log_)); |
| 423 | 423 |
| 424 globals_->extension_event_router_forwarder = | 424 globals_->extension_event_router_forwarder = |
| 425 extension_event_router_forwarder_; | 425 extension_event_router_forwarder_; |
| 426 globals_->system_network_delegate.reset(new ChromeNetworkDelegate( | 426 globals_->system_network_delegate.reset(new ChromeNetworkDelegate( |
| 427 extension_event_router_forwarder_, Profile::kInvalidProfileId, NULL)); | 427 extension_event_router_forwarder_, |
| 428 Profile::kInvalidProfileId, |
| 429 NULL, |
| 430 NULL)); |
| 428 globals_->host_resolver.reset( | 431 globals_->host_resolver.reset( |
| 429 CreateGlobalHostResolver(net_log_)); | 432 CreateGlobalHostResolver(net_log_)); |
| 430 globals_->cert_verifier.reset(new net::CertVerifier); | 433 globals_->cert_verifier.reset(new net::CertVerifier); |
| 431 globals_->dnsrr_resolver.reset(new net::DnsRRResolver); | 434 globals_->dnsrr_resolver.reset(new net::DnsRRResolver); |
| 432 // TODO(willchan): Use the real SSLConfigService. | 435 // TODO(willchan): Use the real SSLConfigService. |
| 433 globals_->ssl_config_service = | 436 globals_->ssl_config_service = |
| 434 net::SSLConfigService::CreateSystemSSLConfigService(); | 437 net::SSLConfigService::CreateSystemSSLConfigService(); |
| 435 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( | 438 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( |
| 436 globals_->host_resolver.get())); | 439 globals_->host_resolver.get())); |
| 437 // For the ProxyScriptFetcher, we use a direct ProxyService. | 440 // For the ProxyScriptFetcher, we use a direct ProxyService. |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 650 system_params.http_auth_handler_factory = | 653 system_params.http_auth_handler_factory = |
| 651 globals_->http_auth_handler_factory.get(); | 654 globals_->http_auth_handler_factory.get(); |
| 652 system_params.network_delegate = globals_->system_network_delegate.get(); | 655 system_params.network_delegate = globals_->system_network_delegate.get(); |
| 653 system_params.net_log = net_log_; | 656 system_params.net_log = net_log_; |
| 654 globals_->system_http_transaction_factory.reset( | 657 globals_->system_http_transaction_factory.reset( |
| 655 new net::HttpNetworkLayer( | 658 new net::HttpNetworkLayer( |
| 656 new net::HttpNetworkSession(system_params))); | 659 new net::HttpNetworkSession(system_params))); |
| 657 globals_->system_request_context = | 660 globals_->system_request_context = |
| 658 ConstructSystemRequestContext(globals_, net_log_); | 661 ConstructSystemRequestContext(globals_, net_log_); |
| 659 } | 662 } |
| OLD | NEW |