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

Unified Diff: chrome/browser/io_thread.cc

Issue 19286002: Remove interface probing for IPv6 support from HostResolverImpl (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: clean up NetLog and net-internals Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index dde18801b1567adb1d4b0d8e1ed17feb9776afd4..16d78a2376829687a18574850623990f27aaadce 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -162,12 +162,9 @@ scoped_ptr<net::HostResolver> CreateGlobalHostResolver(net::NetLog* net_log) {
net::HostResolver::CreateSystemResolver(options, net_log));
// Determine if we should disable IPv6 support.
- if (!command_line.HasSwitch(switches::kEnableIPv6)) {
- if (command_line.HasSwitch(switches::kDisableIPv6)) {
- global_host_resolver->SetDefaultAddressFamily(net::ADDRESS_FAMILY_IPV4);
- } else {
- global_host_resolver->ProbeIPv6Support();
- }
+ if (!command_line.HasSwitch(switches::kEnableIPv6) &&
+ command_line.HasSwitch(switches::kDisableIPv6)) {
+ global_host_resolver->SetDefaultAddressFamily(net::ADDRESS_FAMILY_IPV4);
}
// If hostname remappings were specified on the command-line, layer these
« no previous file with comments | « no previous file | chrome/browser/net/connection_tester.cc » ('j') | chrome/browser/resources/net_internals/dns_view.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698