summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authoragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-27 18:08:20 +0000
committeragayev@chromium.org <agayev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-27 18:08:20 +0000
commit6e7fd16e401caadfafc1c70b376c472048bc7376 (patch)
tree5d8943bafebfb92c81aa3009001baecd63d85cfd /chrome/browser
parentcd6d14b690ea36ec68d0653e664f91dcda0d4273 (diff)
downloadchromium_src-6e7fd16e401caadfafc1c70b376c472048bc7376.zip
chromium_src-6e7fd16e401caadfafc1c70b376c472048bc7376.tar.gz
chromium_src-6e7fd16e401caadfafc1c70b376c472048bc7376.tar.bz2
Undo raw DNS resolver changes, this will be implemented differently, on IO-thread.
BUG=60149 TEST=None Review URL: http://codereview.chromium.org/6893007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-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 9eeec4f..fd3b443 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -27,7 +27,6 @@
#include "chrome/browser/net/proxy_service_factory.h"
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/common/chrome_switches.h"
-#include "chrome/common/net/raw_host_resolver_proc.h"
#include "chrome/common/net/url_fetcher.h"
#include "chrome/common/pref_names.h"
#include "content/browser/browser_thread.h"
@@ -122,24 +121,8 @@ net::HostResolver* CreateGlobalHostResolver(net::NetLog* net_log) {
parallelism = 20;
}
- // Use the specified DNS server for doing raw resolutions if requested
- // from the command-line.
- scoped_refptr<net::HostResolverProc> resolver_proc;
- 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)) {
- resolver_proc =
- new chrome_common_net::RawHostResolverProc(dns_ip_number, NULL);
- } else {
- LOG(ERROR) << "Invalid IP address specified for --dns-server: "
- << dns_ip_string;
- }
- }
-
net::HostResolver* global_host_resolver =
- net::CreateSystemHostResolver(parallelism, resolver_proc.get(), net_log);
+ net::CreateSystemHostResolver(parallelism, net_log);
// Determine if we should disable IPv6 support.
if (!command_line.HasSwitch(switches::kEnableIPv6)) {