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

5 files changed, 2 insertions, 89 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)) {
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index e9e47db..38a28da 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -350,8 +350,6 @@
         'common/net/net_resource_provider.cc',
         'common/net/net_resource_provider.h',
         'common/net/predictor_common.h',
-        'common/net/raw_host_resolver_proc.cc',
-        'common/net/raw_host_resolver_proc.h',
         'common/net/url_fetcher.cc',
         'common/net/url_fetcher.h',
         'common/net/gaia/gaia_auth_consumer.cc',
diff --git a/chrome/common/net/raw_host_resolver_proc.cc b/chrome/common/net/raw_host_resolver_proc.cc
deleted file mode 100644
index 474afa2..0000000
--- a/chrome/common/net/raw_host_resolver_proc.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/common/net/raw_host_resolver_proc.h"
-
-#include "base/logging.h"
-#include "net/base/net_errors.h"
-
-namespace chrome_common_net {
-
-RawHostResolverProc::RawHostResolverProc(const net::IPAddressNumber& dns_server,
-                                         net::HostResolverProc* previous)
-    : HostResolverProc(previous), dns_server_(dns_server) {}
-
-int RawHostResolverProc::Resolve(const std::string& host,
-                                 net::AddressFamily address_family,
-                                 net::HostResolverFlags host_resolver_flags,
-                                 net::AddressList* addrlist,
-                                 int* os_error) {
-  // TODO(agayev): Implement raw DNS resolution.
-  LOG(INFO) << "trying to resolve " << host;
-  return net::ERR_NAME_NOT_RESOLVED;
-}
-
-RawHostResolverProc::~RawHostResolverProc() {}
-
-}  // namespace chrome_common_net
diff --git a/chrome/common/net/raw_host_resolver_proc.h b/chrome/common/net/raw_host_resolver_proc.h
deleted file mode 100644
index 7ec751a..0000000
--- a/chrome/common/net/raw_host_resolver_proc.h
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_COMMON_NET_RAW_HOST_RESOLVER_PROC_H_
-#define CHROME_COMMON_NET_RAW_HOST_RESOLVER_PROC_H_
-#pragma once
-
-// RawHostResolverProc will eventually be a getaddrinfo() replacement.  It
-// will construct and send DNS queries to the DNS server specified via
-// --dns-server flag and will parse the responses and put it into a cache
-// together with the TTL.  Necessary amendments will be made to cache and
-// HostResolverProc interface to accomodate these.
-
-#include <string>
-
-#include "net/base/host_resolver_proc.h"
-#include "net/base/net_util.h"
-
-namespace chrome_common_net {
-
-class RawHostResolverProc : public net::HostResolverProc {
- public:
-  RawHostResolverProc(const net::IPAddressNumber& dns_server,
-                      net::HostResolverProc* previous);
-
-  virtual int Resolve(const std::string& host,
-                      net::AddressFamily address_family,
-                      net::HostResolverFlags host_resolver_flags,
-                      net::AddressList* addrlist,
-                      int* os_error);
- private:
-  virtual ~RawHostResolverProc();
-
-  net::IPAddressNumber dns_server_;
-};
-
-}  // namespace chrome_common_net
-
-#endif  // CHROME_COMMON_NET_RAW_HOST_RESOLVER_PROC_H_
diff --git a/chrome/service/net/service_url_request_context.cc b/chrome/service/net/service_url_request_context.cc
index d041f6a..b3f47f6 100644
--- a/chrome/service/net/service_url_request_context.cc
+++ b/chrome/service/net/service_url_request_context.cc
@@ -108,7 +108,7 @@ ServiceURLRequestContext::ServiceURLRequestContext(
     net::ProxyService* net_proxy_service) : user_agent_(user_agent) {
   set_host_resolver(
       net::CreateSystemHostResolver(net::HostResolver::kDefaultParallelism,
-                                    NULL, NULL));
+                                    NULL));
   set_proxy_service(net_proxy_service);
   set_cert_verifier(new net::CertVerifier);
   set_dnsrr_resolver(new net::DnsRRResolver);