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 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
499 globals_->system_cookie_store = new net::CookieMonster(NULL, NULL); | 499 globals_->system_cookie_store = new net::CookieMonster(NULL, NULL); |
500 // In-memory server bound cert store. | 500 // In-memory server bound cert store. |
501 globals_->system_server_bound_cert_service.reset( | 501 globals_->system_server_bound_cert_service.reset( |
502 new net::ServerBoundCertService( | 502 new net::ServerBoundCertService( |
503 new net::DefaultServerBoundCertStore(NULL), | 503 new net::DefaultServerBoundCertStore(NULL), |
504 base::WorkerPool::GetTaskRunner(true))); | 504 base::WorkerPool::GetTaskRunner(true))); |
505 globals_->dns_probe_service.reset(new chrome_browser_net::DnsProbeService()); | 505 globals_->dns_probe_service.reset(new chrome_browser_net::DnsProbeService()); |
506 globals_->load_time_stats.reset(new chrome_browser_net::LoadTimeStats()); | 506 globals_->load_time_stats.reset(new chrome_browser_net::LoadTimeStats()); |
507 globals_->host_mapping_rules.reset(new net::HostMappingRules()); | 507 globals_->host_mapping_rules.reset(new net::HostMappingRules()); |
508 globals_->http_user_agent_settings.reset( | 508 globals_->http_user_agent_settings.reset( |
509 new BasicHttpUserAgentSettings(EmptyString(), EmptyString())); | 509 new BasicHttpUserAgentSettings(EmptyString())); |
brettw
2013/03/14 04:46:22
Can you change this existing code to just use std:
| |
510 if (command_line.HasSwitch(switches::kHostRules)) { | 510 if (command_line.HasSwitch(switches::kHostRules)) { |
511 globals_->host_mapping_rules->SetRulesFromString( | 511 globals_->host_mapping_rules->SetRulesFromString( |
512 command_line.GetSwitchValueASCII(switches::kHostRules)); | 512 command_line.GetSwitchValueASCII(switches::kHostRules)); |
513 } | 513 } |
514 if (command_line.HasSwitch(switches::kIgnoreCertificateErrors)) | 514 if (command_line.HasSwitch(switches::kIgnoreCertificateErrors)) |
515 globals_->ignore_certificate_errors = true; | 515 globals_->ignore_certificate_errors = true; |
516 if (command_line.HasSwitch(switches::kTestingFixedHttpPort)) { | 516 if (command_line.HasSwitch(switches::kTestingFixedHttpPort)) { |
517 globals_->testing_fixed_http_port = | 517 globals_->testing_fixed_http_port = |
518 GetSwitchValueAsInt(command_line, switches::kTestingFixedHttpPort); | 518 GetSwitchValueAsInt(command_line, switches::kTestingFixedHttpPort); |
519 } | 519 } |
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
898 globals_->system_request_context.reset( | 898 globals_->system_request_context.reset( |
899 ConstructSystemRequestContext(globals_, net_log_)); | 899 ConstructSystemRequestContext(globals_, net_log_)); |
900 | 900 |
901 sdch_manager_->set_sdch_fetcher( | 901 sdch_manager_->set_sdch_fetcher( |
902 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); | 902 new SdchDictionaryFetcher(system_url_request_context_getter_.get())); |
903 } | 903 } |
904 | 904 |
905 void IOThread::UpdateDnsClientEnabled() { | 905 void IOThread::UpdateDnsClientEnabled() { |
906 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); | 906 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); |
907 } | 907 } |
OLD | NEW |