Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(772)

Side by Side Diff: chrome/browser/io_thread.cc

Issue 13270005: Display DNS probe results. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: ...actually add the unittests Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 // For the ProxyScriptFetcher, we use a direct ProxyService. 509 // For the ProxyScriptFetcher, we use a direct ProxyService.
510 globals_->proxy_script_fetcher_proxy_service.reset( 510 globals_->proxy_script_fetcher_proxy_service.reset(
511 net::ProxyService::CreateDirectWithNetLog(net_log_)); 511 net::ProxyService::CreateDirectWithNetLog(net_log_));
512 // In-memory cookie store. 512 // In-memory cookie store.
513 globals_->system_cookie_store = new net::CookieMonster(NULL, NULL); 513 globals_->system_cookie_store = new net::CookieMonster(NULL, NULL);
514 // In-memory server bound cert store. 514 // In-memory server bound cert store.
515 globals_->system_server_bound_cert_service.reset( 515 globals_->system_server_bound_cert_service.reset(
516 new net::ServerBoundCertService( 516 new net::ServerBoundCertService(
517 new net::DefaultServerBoundCertStore(NULL), 517 new net::DefaultServerBoundCertStore(NULL),
518 base::WorkerPool::GetTaskRunner(true))); 518 base::WorkerPool::GetTaskRunner(true)));
519 globals_->dns_probe_service.reset(new chrome_browser_net::DnsProbeService()); 519 globals_->dns_probe_service.reset(new DnsProbeService());
520 globals_->load_time_stats.reset(new chrome_browser_net::LoadTimeStats()); 520 globals_->load_time_stats.reset(new chrome_browser_net::LoadTimeStats());
521 globals_->host_mapping_rules.reset(new net::HostMappingRules()); 521 globals_->host_mapping_rules.reset(new net::HostMappingRules());
522 globals_->http_user_agent_settings.reset( 522 globals_->http_user_agent_settings.reset(
523 new BasicHttpUserAgentSettings(std::string())); 523 new BasicHttpUserAgentSettings(std::string()));
524 if (command_line.HasSwitch(switches::kHostRules)) { 524 if (command_line.HasSwitch(switches::kHostRules)) {
525 globals_->host_mapping_rules->SetRulesFromString( 525 globals_->host_mapping_rules->SetRulesFromString(
526 command_line.GetSwitchValueASCII(switches::kHostRules)); 526 command_line.GetSwitchValueASCII(switches::kHostRules));
527 } 527 }
528 if (command_line.HasSwitch(switches::kIgnoreCertificateErrors)) 528 if (command_line.HasSwitch(switches::kIgnoreCertificateErrors))
529 globals_->ignore_certificate_errors = true; 529 globals_->ignore_certificate_errors = true;
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
951 base::FieldTrialList::FindFullName(kQuicFieldTrialName); 951 base::FieldTrialList::FindFullName(kQuicFieldTrialName);
952 952
953 if (command_line.HasSwitch(switches::kDisableQuic)) 953 if (command_line.HasSwitch(switches::kDisableQuic))
954 return false; 954 return false;
955 955
956 if (command_line.HasSwitch(switches::kEnableQuic)) 956 if (command_line.HasSwitch(switches::kEnableQuic))
957 return true; 957 return true;
958 958
959 return quic_trial_group == kQuicFieldTrialEnabledGroupName; 959 return quic_trial_group == kQuicFieldTrialEnabledGroupName;
960 } 960 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698