| 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
|
|
|