4 files changed, 1 insertions, 64 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)) {
diff --git a/chrome/browser/net/passive_log_collector.cc b/chrome/browser/net/passive_log_collector.cc
index ca321dd..6e522a7 100644
--- a/chrome/browser/net/passive_log_collector.cc
+++ b/chrome/browser/net/passive_log_collector.cc
@@ -78,8 +78,6 @@ PassiveLogCollector::PassiveLogCollector()
   trackers_[net::NetLog::SOURCE_EXPONENTIAL_BACKOFF_THROTTLING] =
       &exponential_backoff_throttling_tracker_;
   trackers_[net::NetLog::SOURCE_DNS_TRANSACTION] = &dns_transaction_tracker_;
-  trackers_[net::NetLog::SOURCE_ASYNC_HOST_RESOLVER_REQUEST] =
-      &async_host_resolver_request_tracker_;
   // Make sure our mapping is up-to-date.
   for (size_t i = 0; i < arraysize(trackers_); ++i)
     DCHECK(trackers_[i]) << "Unhandled SourceType: " << i;
@@ -697,30 +695,3 @@ PassiveLogCollector::DnsTransactionTracker::DoAddEntry(
   }
   return ACTION_NONE;
 }
-
-//----------------------------------------------------------------------------
-// AsyncHostResolverRequestTracker
-//----------------------------------------------------------------------------
-
-const size_t
-PassiveLogCollector::AsyncHostResolverRequestTracker::kMaxNumSources = 100;
-
-const size_t
-PassiveLogCollector::AsyncHostResolverRequestTracker::kMaxGraveyardSize = 15;
-
-PassiveLogCollector::
-    AsyncHostResolverRequestTracker::AsyncHostResolverRequestTracker()
-        : SourceTracker(kMaxNumSources, kMaxGraveyardSize, NULL) {
-}
-
-PassiveLogCollector::SourceTracker::Action
-PassiveLogCollector::AsyncHostResolverRequestTracker::DoAddEntry(
-    const ChromeNetLog::Entry& entry,
-    SourceInfo* out_info) {
-  AddEntryToSourceInfo(entry, out_info);
-  if (entry.type == net::NetLog::TYPE_ASYNC_HOST_RESOLVER_REQUEST &&
-      entry.phase == net::NetLog::PHASE_END) {
-    return ACTION_MOVE_TO_GRAVEYARD;
-  }
-  return ACTION_NONE;
-}
diff --git a/chrome/browser/net/passive_log_collector.h b/chrome/browser/net/passive_log_collector.h
index 28598b2..56c60c7 100644
--- a/chrome/browser/net/passive_log_collector.h
+++ b/chrome/browser/net/passive_log_collector.h
@@ -369,21 +369,6 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserver {
     DISALLOW_COPY_AND_ASSIGN(DnsTransactionTracker);
   };
 
-  // Tracks the log entries for the last seen SOURCE_ASYNC_HOST_RESOLVER_REQUEST
-  class AsyncHostResolverRequestTracker : public SourceTracker {
-   public:
-    static const size_t kMaxNumSources;
-    static const size_t kMaxGraveyardSize;
-
-    AsyncHostResolverRequestTracker();
-
-   private:
-    virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
-
-    DISALLOW_COPY_AND_ASSIGN(AsyncHostResolverRequestTracker);
-  };
-
   PassiveLogCollector();
   virtual ~PassiveLogCollector();
 
@@ -425,7 +410,6 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserver {
   HttpStreamJobTracker http_stream_job_tracker_;
   ExponentialBackoffThrottlingTracker exponential_backoff_throttling_tracker_;
   DnsTransactionTracker dns_transaction_tracker_;
-  AsyncHostResolverRequestTracker async_host_resolver_request_tracker_;
 
   // This array maps each NetLog::SourceType to one of the tracker instances
   // defined above. Use of this array avoid duplicating the list of trackers
diff --git a/chrome/browser/resources/net_internals/sourceentry.js b/chrome/browser/resources/net_internals/sourceentry.js
index 1a901ca..3cb5fd0 100644
--- a/chrome/browser/resources/net_internals/sourceentry.js
+++ b/chrome/browser/resources/net_internals/sourceentry.js
@@ -321,7 +321,6 @@ SourceEntry.prototype.getDescription = function() {
           description = connectJobSourceEntry.getDescription();
       }
       break;
-    case LogSourceType.ASYNC_HOST_RESOLVER_REQUEST:
     case LogSourceType.DNS_TRANSACTION:
       description = e.params.hostname;
       break;