summaryrefslogtreecommitdiffstats
path: root/chrome/browser/io_thread.cc
diff options
context:
space:
mode:
authoragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 20:16:26 +0000
committeragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-20 20:16:26 +0000
commitde093d1f62f204fc02d8f693bc88fd99f1d74171 (patch)
treeb3a6ffa4fac912743c102c067d8f3c5e747e199a /chrome/browser/io_thread.cc
parent5728fef191336ccbfbc910fc851cbe814862b6e6 (diff)
downloadchromium_src-de093d1f62f204fc02d8f693bc88fd99f1d74171.zip
chromium_src-de093d1f62f204fc02d8f693bc88fd99f1d74171.tar.gz
chromium_src-de093d1f62f204fc02d8f693bc88fd99f1d74171.tar.bz2
Revert 93237 - Implement AsyncHostResolver, an asynchronous HostResolver.
BUG=60149 TEST=net_unittests --gtest_filter="AsyncHostResolverTest*" Review URL: http://codereview.chromium.org/7342046 TBR=agayev@chromium.org Review URL: http://codereview.chromium.org/7466010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.cc')
-rw-r--r--chrome/browser/io_thread.cc19
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)) {