Revert 113282 - Isolates generic DnsClient from AsyncHostResolver.

net/dns/dns_test_util.h

 // Copyright (c) 2011 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_
 #pragma once
 
 #include <deque>
 #include <vector>
 
 #include "base/logging.h"
 #include "net/base/dns_util.h"
 #include "net/base/host_resolver.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
-#include "net/dns/dns_protocol.h"
 
 namespace net {
 
+// DNS related classes make use of PRNG for various tasks.  This class is
+// used as a PRNG for unit testing those tasks.  It takes a deque of
+// integers |numbers| which should be returned by calls to GetNext.
+class TestPrng {
+ public:
+  explicit TestPrng(const std::deque<int>& numbers);
+  ~TestPrng();
+
+  // Pops and returns the next number from |numbers_| deque.
+  int GetNext(int min, int max);
+
+ private:
+  std::deque<int> numbers_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestPrng);
+};
+
 // A utility function for tests that given an array of IP literals,
 // converts it to an IPAddressList.
 bool ConvertStringsToIPAddressList(
     const char* const ip_strings[], size_t size, IPAddressList* address_list);
 
 // A utility function for tests that creates an IPEndPoint whose IP is
 // |ip_string| and whose port is |port| and stores it in |endpoint|.
 bool CreateDnsAddress(const char* ip_string, uint16 port, IPEndPoint* endpoint);
 
 static const char kDnsIp[] = "192.168.1.1";
 static const uint16 kDnsPort = 53;
 
 //-----------------------------------------------------------------------------
 // Query/response set for www.google.com, ID is fixed to 0.
 static const char kT0HostName[] = "www.google.com";
-static const uint16 kT0Qtype = dns_protocol::kTypeA;
+static const uint16 kT0Qtype = kDNS_A;
 static const char kT0DnsName[] = {
   0x03, 'w', 'w', 'w',
   0x06, 'g', 'o', 'o', 'g', 'l', 'e',
   0x03, 'c', 'o', 'm',
   0x00
 };
 static const uint8 kT0QueryDatagram[] = {
   // query for www.google.com, type A.
   0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x03, 0x77, 0x77, 0x77,
@@ skipping 22 matching lines @@
   0x4a, 0x7d, 0xe2, 0xb2
 };
 static const char* const kT0IpAddresses[] = {
   "74.125.226.179", "74.125.226.180", "74.125.226.176",
   "74.125.226.177", "74.125.226.178"
 };
 
 //-----------------------------------------------------------------------------
 // Query/response set for codereview.chromium.org, ID is fixed to 1.
 static const char kT1HostName[] = "codereview.chromium.org";
-static const uint16 kT1Qtype = dns_protocol::kTypeA;
+static const uint16 kT1Qtype = kDNS_A;
 static const char kT1DnsName[] = {
-  0x0a, 'c', 'o', 'd', 'e', 'r', 'e', 'v', 'i', 'e', 'w',
-  0x08, 'c', 'h', 'r', 'o', 'm', 'i', 'u', 'm',
+  0x12, 'c', 'o', 'd', 'e', 'r', 'e', 'v', 'i', 'e', 'w',
+  0x10, 'c', 'h', 'r', 'o', 'm', 'i', 'u', 'm',
   0x03, 'o', 'r', 'g',
   0x00
 };
 static const uint8 kT1QueryDatagram[] = {
   // query for codereview.chromium.org, type A.
   0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x0a, 0x63, 0x6f, 0x64,
   0x65, 0x72, 0x65, 0x76, 0x69, 0x65, 0x77, 0x08,
   0x63, 0x68, 0x72, 0x6f, 0x6d, 0x69, 0x75, 0x6d,
   0x03, 0x6f, 0x72, 0x67, 0x00, 0x00, 0x01, 0x00,
@@ skipping 14 matching lines @@
   0x35, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01,
   0x0b, 0x00, 0x04, 0x40, 0xe9, 0xa9, 0x79
 };
 static const char* const kT1IpAddresses[] = {
   "64.233.169.121"
 };
 
 //-----------------------------------------------------------------------------
 // Query/response set for www.ccs.neu.edu, ID is fixed to 2.
 static const char kT2HostName[] = "www.ccs.neu.edu";
-static const uint16 kT2Qtype = dns_protocol::kTypeA;
+static const uint16 kT2Qtype = kDNS_A;
 static const char kT2DnsName[] = {
   0x03, 'w', 'w', 'w',
-  0x03, 'c', 'c', 's',
+  0x03, 'c', 'c', 'c',
   0x03, 'n', 'e', 'u',
   0x03, 'e', 'd', 'u',
   0x00
 };
 static const uint8 kT2QueryDatagram[] = {
   // query for www.ccs.neu.edu, type A.
   0x00, 0x02, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x03, 0x77, 0x77, 0x77,
   0x03, 0x63, 0x63, 0x73, 0x03, 0x6e, 0x65, 0x75,
   0x03, 0x65, 0x64, 0x75, 0x00, 0x00, 0x01, 0x00,
@@ skipping 12 matching lines @@
   0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01, 0x2c,
   0x00, 0x04, 0x81, 0x0a, 0x74, 0x51
 };
 static const char* const kT2IpAddresses[] = {
   "129.10.116.81"
 };
 
 //-----------------------------------------------------------------------------
 // Query/response set for www.google.az, ID is fixed to 3.
 static const char kT3HostName[] = "www.google.az";
-static const uint16 kT3Qtype = dns_protocol::kTypeA;
+static const uint16 kT3Qtype = kDNS_A;
 static const char kT3DnsName[] = {
   0x03, 'w', 'w', 'w',
   0x06, 'g', 'o', 'o', 'g', 'l', 'e',
   0x02, 'a', 'z',
   0x00
 };
 static const uint8 kT3QueryDatagram[] = {
   // query for www.google.az, type A.
   0x00, 0x03, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00,
   0x00, 0x00, 0x00, 0x00, 0x03, 0x77, 0x77, 0x77,
@@ skipping 26 matching lines @@
   0x15, 0x00, 0x04, 0x4a, 0x7d, 0xe2, 0xb1
 };
 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"
 };
 
 }  // namespace net
 
 #endif  // NET_DNS_DNS_TEST_UTIL_H_