DnsQuery: changed raw function pointer to callback.

net/base/dns_response_unittest.cc

 // 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.
 
+#include "base/bind.h"
 #include "base/rand_util.h"
 #include "net/base/dns_response.h"

[willchan no longer on Chromium, 2011/06/28 09:58:23]

This header should go first.

[agayev, 2011/06/28 14:37:24]

Done.

 #include "net/base/dns_util.h"
 #include "net/base/net_errors.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 // DNS response consists of a header followed by a question followed by
 // answer.  Header format, question format and response format are
 // described below.  For the meaning of specific fields, please see RFC
 // 1035.
@@ skipping 46 matching lines @@
 //  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
 //  |                   RDLENGTH                    |
 //  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--|
 //  /                     RDATA                     /
 //  /                                               /
 //  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
 
 // TODO(agayev): add more thorough tests.
 TEST(DnsResponseTest, ResponseWithCnameA) {
   const std::string kHostnameDns("\012codereview\010chromium\003org", 25);
+  base::RandIntCallback rand_int_cb = base::Bind(&base::RandInt);
 
-  DnsQuery q1(kHostnameDns, kDNS_A, base::RandUint64);
+  DnsQuery q1(kHostnameDns, kDNS_A, rand_int_cb);
   uint8 id_hi = q1.id() >> 8, id_lo = q1.id() & 0xff;
 
   uint8 ip[] = {              // codereview.chromium.org resolves to
     0x4a, 0x7d, 0x5f, 0x79    // 74.125.95.121
   };
 
   std::vector<IPAddressNumber> expected_ips;
   expected_ips.push_back(IPAddressNumber(ip, ip + arraysize(ip)));
 
   uint8 response_data[] = {
@@ skipping 45 matching lines @@
          r1.io_buffer()->size());
 
   // Verify resolved IPs.
   int response_size = arraysize(response_data);
   std::vector<IPAddressNumber> actual_ips;
   EXPECT_EQ(OK, r1.Parse(response_size, &actual_ips));
   EXPECT_EQ(expected_ips, actual_ips);
 }
 
 }  // namespace net