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

net/dns/dns_test_util.h

 // Copyright (c) 2012 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 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"
 #include "net/dns/dns_protocol.h"
 
 namespace net {
 
 //-----------------------------------------------------------------------------
 // Query/response set for www.google.com, ID is fixed to 0.
 static const char kT0HostName[] = "www.google.com";
@@ skipping 141 matching lines @@
 static const char* const kT3IpAddresses[] = {
   "74.125.226.178", "74.125.226.179", "74.125.226.180",
   "74.125.226.176", "74.125.226.177"
 };
 static const char kT3CanonName[] = "www.l.google.com";
 static const int kT3TTL = 0x00000015;
 // +2 for the CNAME records.
 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:
   virtual ~MockDnsConfigService();
 
   // NetworkChangeNotifier::DNSObserver:
   virtual void OnDNSChanged(unsigned detail) OVERRIDE;
 
   // Expose the protected methods for tests.
   void ChangeConfig(const DnsConfig& config);
   void ChangeHosts(const DnsHosts& hosts);
 };
 
 
 }  // namespace net
 
 #endif  // NET_DNS_DNS_TEST_UTIL_H_