DnsQuery: changed raw function pointer to callback.

net/base/dns_query_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_query.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 "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 // DNS query consists of a header followed by a question.  Header format
 // and question format are described below.  For the meaning of specific
 // fields, please see RFC 1035.
 
 // Header format.
@@ skipping 21 matching lines @@
 //  /                     QNAME                     /
 //  /                                               /
 //  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
 //  |                     QTYPE                     |
 //  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
 //  |                     QCLASS                    |
 //  +--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+
 
 TEST(DnsQueryTest, ConstructorTest) {
   std::string kHostnameDns("\003www\006google\003com", 16);
+  base::RandIntCallback rand_int_cb = base::Bind(&base::RandInt);
 
-  DnsQuery q1(kHostnameDns, kDNS_A, base::RandUint64);
+  DnsQuery q1(kHostnameDns, kDNS_A, rand_int_cb);
   EXPECT_EQ(kDNS_A, q1.qtype());
 
   uint8 id_hi = q1.id() >> 8, id_lo = q1.id() & 0xff;
 
   // See the top of the file for the description of a DNS query.
   const uint8 query_data[] = {
     // Header
     id_hi, id_lo,
     0x01, 0x00,               // Flags -- set RD (recursion desired) bit.
     0x00, 0x01,               // Set QDCOUNT (question count) to 1, all the
@@ skipping 11 matching lines @@
     0x00, 0x01,               // QCLASS: IN class.
   };
 
   int expected_size = arraysize(query_data);
   EXPECT_EQ(expected_size, q1.io_buffer()->size());
   EXPECT_EQ(0, memcmp(q1.io_buffer()->data(), query_data, expected_size));
 }
 
 TEST(DnsQueryTest, CloneTest) {
   std::string kHostnameDns("\003www\006google\003com", 16);
+  base::RandIntCallback rand_int_cb = base::Bind(&base::RandInt);
 
-  DnsQuery q1(kHostnameDns, kDNS_A, base::RandUint64);
+  DnsQuery q1(kHostnameDns, kDNS_A, rand_int_cb);
   scoped_ptr<DnsQuery> q2(q1.CloneWithNewId());
   EXPECT_EQ(q1.io_buffer()->size(), q2->io_buffer()->size());
   EXPECT_EQ(q1.qtype(), q2->qtype());
   EXPECT_EQ(q1.question_size(), q2->question_size());
   EXPECT_EQ(0, memcmp(q1.question_data(), q2->question_data(),
                       q1.question_size()));
 }
 
 TEST(DnsQueryTest, RandomIdTest) {
   std::string kHostnameDns("\003www\006google\003com", 16);
+  base::RandIntCallback rand_int_cb = base::Bind(&base::RandInt);
 
   // Since id fields are 16-bit values, we iterate to reduce the
   // probability of collision, to avoid a flaky test.
   bool ids_are_random = false;
   for (int i = 0; i < 1000; ++i) {
-    DnsQuery q1(kHostnameDns, kDNS_A, base::RandUint64);
-    DnsQuery q2(kHostnameDns, kDNS_A, base::RandUint64);
+    DnsQuery q1(kHostnameDns, kDNS_A, rand_int_cb);
+    DnsQuery q2(kHostnameDns, kDNS_A, rand_int_cb);
     scoped_ptr<DnsQuery> q3(q1.CloneWithNewId());
     ids_are_random = q1.id () != q2.id() && q1.id() != q3->id();
     if (ids_are_random)
       break;
   }
   EXPECT_TRUE(ids_are_random);
 }
 
 }  // namespace net