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

net/dns/dns_test_util.h

Index: net/dns/dns_test_util.h
===================================================================
--- net/dns/dns_test_util.h	(revision 151600)
+++ net/dns/dns_test_util.h	(working copy)
@@ -5,9 +5,6 @@
 #ifndef NET_DNS_DNS_TEST_UTIL_H_
 #define NET_DNS_DNS_TEST_UTIL_H_
 
-#include <string>
-#include <vector>
-
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "net/dns/dns_config_service.h"
@@ -169,25 +166,8 @@
 static const unsigned kT3RecordCount = arraysize(kT3IpAddresses) + 2;
 
 class DnsClient;
-
-struct MockDnsClientRule {
-  enum Result {
-    FAIL_SYNC,   // Fail synchronously with ERR_NAME_NOT_RESOLVED.
-    FAIL_ASYNC,  // Fail asynchronously with ERR_NAME_NOT_RESOLVED.
-    EMPTY,       // Return an empty response.
-    OK,          // Return a response with loopback address.
-  };
-
-  std::string prefix;
-  uint16 qtype;
-  Result result;
-};
-
-typedef std::vector<MockDnsClientRule> MockDnsClientRuleList;
-
 // Creates mock DnsClient for testing HostResolverImpl.
-scoped_ptr<DnsClient> CreateMockDnsClient(const DnsConfig& config,
-                                          const MockDnsClientRuleList& rules);
+scoped_ptr<DnsClient> CreateMockDnsClient(const DnsConfig& config);
 
 class MockDnsConfigService : public DnsConfigService {
  public:
Property changes on: net/dns/dns_test_util.h
___________________________________________________________________
Added: svn:mergeinfo