| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 #include "chrome/browser/browser_process.h" | 22 #include "chrome/browser/browser_process.h" |
| 23 #include "chrome/browser/extensions/extension_event_router_forwarder.h" | 23 #include "chrome/browser/extensions/extension_event_router_forwarder.h" |
| 24 #include "chrome/browser/net/chrome_net_log.h" | 24 #include "chrome/browser/net/chrome_net_log.h" |
| 25 #include "chrome/browser/net/chrome_network_delegate.h" | 25 #include "chrome/browser/net/chrome_network_delegate.h" |
| 26 #include "chrome/browser/net/chrome_url_request_context.h" | 26 #include "chrome/browser/net/chrome_url_request_context.h" |
| 27 #include "chrome/browser/net/connect_interceptor.h" | 27 #include "chrome/browser/net/connect_interceptor.h" |
| 28 #include "chrome/browser/net/http_pipelining_compatibility_client.h" | 28 #include "chrome/browser/net/http_pipelining_compatibility_client.h" |
| 29 #include "chrome/browser/net/pref_proxy_config_tracker.h" | 29 #include "chrome/browser/net/pref_proxy_config_tracker.h" |
| 30 #include "chrome/browser/net/proxy_service_factory.h" | 30 #include "chrome/browser/net/proxy_service_factory.h" |
| 31 #include "chrome/browser/net/sdch_dictionary_fetcher.h" | 31 #include "chrome/browser/net/sdch_dictionary_fetcher.h" |
| 32 #include "chrome/browser/predictors/resource_prefetch_predictor.h" |
| 32 #include "chrome/browser/prefs/pref_service.h" | 33 #include "chrome/browser/prefs/pref_service.h" |
| 33 #include "chrome/common/chrome_switches.h" | 34 #include "chrome/common/chrome_switches.h" |
| 34 #include "chrome/common/pref_names.h" | 35 #include "chrome/common/pref_names.h" |
| 35 #include "content/public/browser/browser_thread.h" | 36 #include "content/public/browser/browser_thread.h" |
| 36 #include "content/public/common/content_client.h" | 37 #include "content/public/common/content_client.h" |
| 37 #include "content/public/common/url_fetcher.h" | 38 #include "content/public/common/url_fetcher.h" |
| 38 #include "net/base/cert_verifier.h" | 39 #include "net/base/cert_verifier.h" |
| 39 #include "net/base/default_server_bound_cert_store.h" | 40 #include "net/base/default_server_bound_cert_store.h" |
| 40 #include "net/base/host_cache.h" | 41 #include "net/base/host_cache.h" |
| 41 #include "net/base/host_resolver.h" | 42 #include "net/base/host_resolver.h" |
| (...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 394 new LoggingNetworkChangeObserver(net_log_)); | 395 new LoggingNetworkChangeObserver(net_log_)); |
| 395 | 396 |
| 396 globals_->extension_event_router_forwarder = | 397 globals_->extension_event_router_forwarder = |
| 397 extension_event_router_forwarder_; | 398 extension_event_router_forwarder_; |
| 398 globals_->system_network_delegate.reset(new ChromeNetworkDelegate( | 399 globals_->system_network_delegate.reset(new ChromeNetworkDelegate( |
| 399 extension_event_router_forwarder_, | 400 extension_event_router_forwarder_, |
| 400 NULL, | 401 NULL, |
| 401 NULL, | 402 NULL, |
| 402 NULL, | 403 NULL, |
| 403 NULL, | 404 NULL, |
| 405 NULL, |
| 404 &system_enable_referrers_)); | 406 &system_enable_referrers_)); |
| 405 globals_->host_resolver.reset( | 407 globals_->host_resolver.reset( |
| 406 CreateGlobalHostResolver(net_log_)); | 408 CreateGlobalHostResolver(net_log_)); |
| 407 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); | 409 globals_->cert_verifier.reset(net::CertVerifier::CreateDefault()); |
| 408 globals_->transport_security_state.reset(new net::TransportSecurityState()); | 410 globals_->transport_security_state.reset(new net::TransportSecurityState()); |
| 409 globals_->ssl_config_service = GetSSLConfigService(); | 411 globals_->ssl_config_service = GetSSLConfigService(); |
| 410 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( | 412 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( |
| 411 globals_->host_resolver.get())); | 413 globals_->host_resolver.get())); |
| 412 globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl); | 414 globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl); |
| 413 // For the ProxyScriptFetcher, we use a direct ProxyService. | 415 // For the ProxyScriptFetcher, we use a direct ProxyService. |
| (...skipping 209 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 623 new net::HttpNetworkLayer( | 625 new net::HttpNetworkLayer( |
| 624 new net::HttpNetworkSession(system_params))); | 626 new net::HttpNetworkSession(system_params))); |
| 625 globals_->system_ftp_transaction_factory.reset( | 627 globals_->system_ftp_transaction_factory.reset( |
| 626 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 628 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
| 627 globals_->system_request_context.reset( | 629 globals_->system_request_context.reset( |
| 628 ConstructSystemRequestContext(globals_, net_log_)); | 630 ConstructSystemRequestContext(globals_, net_log_)); |
| 629 | 631 |
| 630 sdch_manager_->set_sdch_fetcher( | 632 sdch_manager_->set_sdch_fetcher( |
| 631 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 633 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
| 632 } | 634 } |
| OLD | NEW |