Revert 151586 - [net/dns] Resolve AF_UNSPEC on dual-stacked systems. Sort addresses according to RF…

net/dns/dns_client.cc

Index: net/dns/dns_client.cc
===================================================================
--- net/dns/dns_client.cc	(revision 151600)
+++ net/dns/dns_client.cc	(working copy)
@@ -7,7 +7,6 @@
 #include "base/bind.h"
 #include "base/rand_util.h"
 #include "net/base/net_log.h"
-#include "net/dns/address_sorter.h"
 #include "net/dns/dns_config_service.h"
 #include "net/dns/dns_session.h"
 #include "net/dns/dns_transaction.h"
@@ -19,9 +18,7 @@
 
 class DnsClientImpl : public DnsClient {
  public:
-  explicit DnsClientImpl(NetLog* net_log)
-      : address_sorter_(AddressSorter::CreateAddressSorter()),
-        net_log_(net_log) {}
+  explicit DnsClientImpl(NetLog* net_log) : net_log_(net_log) {}
 
   virtual void SetConfig(const DnsConfig& config) OVERRIDE {
     factory_.reset();
@@ -43,14 +40,9 @@
     return session_.get() ? factory_.get() : NULL;
   }
 
-  virtual AddressSorter* GetAddressSorter() OVERRIDE {
-    return address_sorter_.get();
-  }
-
  private:
   scoped_refptr<DnsSession> session_;
   scoped_ptr<DnsTransactionFactory> factory_;
-  scoped_ptr<AddressSorter> address_sorter_;
 
   NetLog* net_log_;
 };
Property changes on: net/dns/dns_client.cc
___________________________________________________________________
Added: svn:mergeinfo