| 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/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 globals_->extension_event_router_forwarder = | 388 globals_->extension_event_router_forwarder = |
| 389 extension_event_router_forwarder_; | 389 extension_event_router_forwarder_; |
| 390 globals_->system_network_delegate.reset(new ChromeNetworkDelegate( | 390 globals_->system_network_delegate.reset(new ChromeNetworkDelegate( |
| 391 extension_event_router_forwarder_, | 391 extension_event_router_forwarder_, |
| 392 NULL, | 392 NULL, |
| 393 NULL, | 393 NULL, |
| 394 NULL, | 394 NULL, |
| 395 &system_enable_referrers_)); | 395 &system_enable_referrers_)); |
| 396 globals_->host_resolver.reset( | 396 globals_->host_resolver.reset( |
| 397 CreateGlobalHostResolver(net_log_)); | 397 CreateGlobalHostResolver(net_log_)); |
| 398 globals_->cert_verifier.reset(new net::CertVerifier); | 398 globals_->cert_verifier.reset(net::CertVerifier::CreateDefaultCertVerifier()); |
| 399 globals_->transport_security_state.reset(new net::TransportSecurityState("")); | 399 globals_->transport_security_state.reset(new net::TransportSecurityState("")); |
| 400 globals_->ssl_config_service = GetSSLConfigService(); | 400 globals_->ssl_config_service = GetSSLConfigService(); |
| 401 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( | 401 globals_->http_auth_handler_factory.reset(CreateDefaultAuthHandlerFactory( |
| 402 globals_->host_resolver.get())); | 402 globals_->host_resolver.get())); |
| 403 globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl); | 403 globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl); |
| 404 // For the ProxyScriptFetcher, we use a direct ProxyService. | 404 // For the ProxyScriptFetcher, we use a direct ProxyService. |
| 405 globals_->proxy_script_fetcher_proxy_service.reset( | 405 globals_->proxy_script_fetcher_proxy_service.reset( |
| 406 net::ProxyService::CreateDirectWithNetLog(net_log_)); | 406 net::ProxyService::CreateDirectWithNetLog(net_log_)); |
| 407 // In-memory cookie store. | 407 // In-memory cookie store. |
| 408 globals_->system_cookie_store = new net::CookieMonster(NULL, NULL); | 408 globals_->system_cookie_store = new net::CookieMonster(NULL, NULL); |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 604 new net::HttpNetworkLayer( | 604 new net::HttpNetworkLayer( |
| 605 new net::HttpNetworkSession(system_params))); | 605 new net::HttpNetworkSession(system_params))); |
| 606 globals_->system_ftp_transaction_factory.reset( | 606 globals_->system_ftp_transaction_factory.reset( |
| 607 new net::FtpNetworkLayer(globals_->host_resolver.get())); | 607 new net::FtpNetworkLayer(globals_->host_resolver.get())); |
| 608 globals_->system_request_context = | 608 globals_->system_request_context = |
| 609 ConstructSystemRequestContext(globals_, net_log_); | 609 ConstructSystemRequestContext(globals_, net_log_); |
| 610 | 610 |
| 611 sdch_manager_->set_sdch_fetcher( | 611 sdch_manager_->set_sdch_fetcher( |
| 612 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 612 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
| 613 } | 613 } |
| OLD | NEW |