diff options
| author | agayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 02:29:52 +0000 |
|---|---|---|
| committer | agayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-21 02:29:52 +0000 |
| commit | ea42d58ee7ab17ca8d73a6c133aaae1815d3e85c (patch) | |
| tree | c694696ef5e22f622f5d02adffba936c1739eed9 /chrome/browser/io_thread.cc | |
| parent | 5ae95ba8fa5eb59c0b2448ca9643b9e7cd04b171 (diff) | |
| download | chromium_src-ea42d58ee7ab17ca8d73a6c133aaae1815d3e85c.zip chromium_src-ea42d58ee7ab17ca8d73a6c133aaae1815d3e85c.tar.gz chromium_src-ea42d58ee7ab17ca8d73a6c133aaae1815d3e85c.tar.bz2 | |
Revert 93313 - Implemented AsyncHostResolver -- asynchronous HostResolver.
BUG=60149
TEST=net_unittests --gtest_filter="AsyncHostResolver*"
Review URL: http://codereview.chromium.org/7466011
TBR=agayev@chromium.org
Review URL: http://codereview.chromium.org/7468022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93317 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.cc')
| -rw-r--r-- | chrome/browser/io_thread.cc | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 35070e19..11d8827 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -34,7 +34,6 @@ #include "content/browser/gpu/gpu_process_host.h" #include "content/browser/in_process_webkit/indexed_db_key_utility_client.h" #include "content/common/url_fetcher.h" -#include "net/base/async_host_resolver.h" #include "net/base/cert_verifier.h" #include "net/base/cookie_monster.h" #include "net/base/dnsrr_resolver.h" @@ -161,24 +160,8 @@ net::HostResolver* CreateGlobalHostResolver(net::NetLog* net_log) { } } - net::HostResolver* global_host_resolver = NULL; - if (command_line.HasSwitch(switches::kDnsServer)) { - std::string dns_ip_string = - command_line.GetSwitchValueASCII(switches::kDnsServer); - net::IPAddressNumber dns_ip_number; - if (net::ParseIPLiteralToNumber(dns_ip_string, &dns_ip_number)) { - global_host_resolver = - net::CreateAsyncHostResolver(parallelism, dns_ip_number, net_log); - } else { - LOG(ERROR) << "Invalid IP address specified for --dns-server: " - << dns_ip_string; - } - } - - if (!global_host_resolver) { - global_host_resolver = + net::HostResolver* global_host_resolver = net::CreateSystemHostResolver(parallelism, retry_attempts, net_log); - } // Determine if we should disable IPv6 support. if (!command_line.HasSwitch(switches::kEnableIPv6)) { |