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 493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
504 globals_->system_cookie_store = new net::CookieMonster(NULL, NULL); | 504 globals_->system_cookie_store = new net::CookieMonster(NULL, NULL); |
505 // In-memory server bound cert store. | 505 // In-memory server bound cert store. |
506 globals_->system_server_bound_cert_service.reset( | 506 globals_->system_server_bound_cert_service.reset( |
507 new net::ServerBoundCertService( | 507 new net::ServerBoundCertService( |
508 new net::DefaultServerBoundCertStore(NULL), | 508 new net::DefaultServerBoundCertStore(NULL), |
509 base::WorkerPool::GetTaskRunner(true))); | 509 base::WorkerPool::GetTaskRunner(true))); |
510 globals_->dns_probe_service.reset(new chrome_browser_net::DnsProbeService()); | 510 globals_->dns_probe_service.reset(new chrome_browser_net::DnsProbeService()); |
511 globals_->load_time_stats.reset(new chrome_browser_net::LoadTimeStats()); | 511 globals_->load_time_stats.reset(new chrome_browser_net::LoadTimeStats()); |
512 globals_->host_mapping_rules.reset(new net::HostMappingRules()); | 512 globals_->host_mapping_rules.reset(new net::HostMappingRules()); |
513 globals_->http_user_agent_settings.reset( | 513 globals_->http_user_agent_settings.reset( |
514 new BasicHttpUserAgentSettings(EmptyString(), EmptyString())); | 514 new BasicHttpUserAgentSettings(std::string())); |
515 if (command_line.HasSwitch(switches::kHostRules)) { | 515 if (command_line.HasSwitch(switches::kHostRules)) { |
516 globals_->host_mapping_rules->SetRulesFromString( | 516 globals_->host_mapping_rules->SetRulesFromString( |
517 command_line.GetSwitchValueASCII(switches::kHostRules)); | 517 command_line.GetSwitchValueASCII(switches::kHostRules)); |
518 } | 518 } |
519 if (command_line.HasSwitch(switches::kIgnoreCertificateErrors)) | 519 if (command_line.HasSwitch(switches::kIgnoreCertificateErrors)) |
520 globals_->ignore_certificate_errors = true; | 520 globals_->ignore_certificate_errors = true; |
521 if (command_line.HasSwitch(switches::kTestingFixedHttpPort)) { | 521 if (command_line.HasSwitch(switches::kTestingFixedHttpPort)) { |
522 globals_->testing_fixed_http_port = | 522 globals_->testing_fixed_http_port = |
523 GetSwitchValueAsInt(command_line, switches::kTestingFixedHttpPort); | 523 GetSwitchValueAsInt(command_line, switches::kTestingFixedHttpPort); |
524 } | 524 } |
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
901 globals_->system_request_context.reset( | 901 globals_->system_request_context.reset( |
902 ConstructSystemRequestContext(globals_, net_log_)); | 902 ConstructSystemRequestContext(globals_, net_log_)); |
903 | 903 |
904 sdch_manager_->set_sdch_fetcher( | 904 sdch_manager_->set_sdch_fetcher( |
905 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 905 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
906 } | 906 } |
907 | 907 |
908 void IOThread::UpdateDnsClientEnabled() { | 908 void IOThread::UpdateDnsClientEnabled() { |
909 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); | 909 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); |
910 } | 910 } |
OLD | NEW |