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 486 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
497 // For the ProxyScriptFetcher, we use a direct ProxyService. | 497 // For the ProxyScriptFetcher, we use a direct ProxyService. |
498 globals_->proxy_script_fetcher_proxy_service.reset( | 498 globals_->proxy_script_fetcher_proxy_service.reset( |
499 net::ProxyService::CreateDirectWithNetLog(net_log_)); | 499 net::ProxyService::CreateDirectWithNetLog(net_log_)); |
500 // In-memory cookie store. | 500 // In-memory cookie store. |
501 globals_->system_cookie_store = new net::CookieMonster(NULL, NULL); | 501 globals_->system_cookie_store = new net::CookieMonster(NULL, NULL); |
502 // In-memory server bound cert store. | 502 // In-memory server bound cert store. |
503 globals_->system_server_bound_cert_service.reset( | 503 globals_->system_server_bound_cert_service.reset( |
504 new net::ServerBoundCertService( | 504 new net::ServerBoundCertService( |
505 new net::DefaultServerBoundCertStore(NULL), | 505 new net::DefaultServerBoundCertStore(NULL), |
506 base::WorkerPool::GetTaskRunner(true))); | 506 base::WorkerPool::GetTaskRunner(true))); |
507 globals_->dns_probe_service.reset(new chrome_browser_net::DnsProbeService()); | 507 globals_->dns_probe_service.reset( |
| 508 chrome_browser_net::DnsProbeService::CreateDefault()); |
508 globals_->load_time_stats.reset(new chrome_browser_net::LoadTimeStats()); | 509 globals_->load_time_stats.reset(new chrome_browser_net::LoadTimeStats()); |
509 globals_->host_mapping_rules.reset(new net::HostMappingRules()); | 510 globals_->host_mapping_rules.reset(new net::HostMappingRules()); |
510 globals_->http_user_agent_settings.reset( | 511 globals_->http_user_agent_settings.reset( |
511 new BasicHttpUserAgentSettings(std::string())); | 512 new BasicHttpUserAgentSettings(std::string())); |
512 if (command_line.HasSwitch(switches::kHostRules)) { | 513 if (command_line.HasSwitch(switches::kHostRules)) { |
513 globals_->host_mapping_rules->SetRulesFromString( | 514 globals_->host_mapping_rules->SetRulesFromString( |
514 command_line.GetSwitchValueASCII(switches::kHostRules)); | 515 command_line.GetSwitchValueASCII(switches::kHostRules)); |
515 } | 516 } |
516 if (command_line.HasSwitch(switches::kIgnoreCertificateErrors)) | 517 if (command_line.HasSwitch(switches::kIgnoreCertificateErrors)) |
517 globals_->ignore_certificate_errors = true; | 518 globals_->ignore_certificate_errors = true; |
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
911 globals_->system_request_context.reset( | 912 globals_->system_request_context.reset( |
912 ConstructSystemRequestContext(globals_, net_log_)); | 913 ConstructSystemRequestContext(globals_, net_log_)); |
913 | 914 |
914 sdch_manager_->set_sdch_fetcher( | 915 sdch_manager_->set_sdch_fetcher( |
915 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 916 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
916 } | 917 } |
917 | 918 |
918 void IOThread::UpdateDnsClientEnabled() { | 919 void IOThread::UpdateDnsClientEnabled() { |
919 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); | 920 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); |
920 } | 921 } |
OLD | NEW |