DnsQuery: changed raw function pointer to callback.

net/base/dns_query.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_BASE_DNS_QUERY_H_
 #define NET_BASE_DNS_QUERY_H_
 #pragma once
 
 #include <string>
 
+#include "base/rand_util.h"

[cbentzel, 2011/06/28 19:08:18]

You don't need this include anymore

[willchan no longer on Chromium, 2011/06/28 19:10:47]

Is this header still necessary?

[agayev, 2011/06/28 19:49:55]

Done.

 #include "net/base/io_buffer.h"
 #include "net/base/net_api.h"
 #include "net/base/net_util.h"
+#include "net/base/rand_callback.h"
 
-namespace net{
+namespace net {
 
 // Represents on-the-wire DNS query message as an object.
 class NET_TEST DnsQuery {
  public:
   // Constructs a query message from |dns_name| which *MUST* be in a valid
   // DNS name format, and |qtype| which must be either kDNS_A or kDNS_AAA.
 
   // Every generated object has a random ID, hence two objects generated
   // with the same set of constructor arguments are generally not equal;
   // there is a 1/2^16 chance of them being equal due to size of |id_|.
-  DnsQuery(const std::string& dns_name, uint16 qtype, uint64 (*prng)());
+  DnsQuery(const std::string& dns_name,
+           uint16 qtype,
+           const RandIntCallback& rand_int);
   ~DnsQuery();
 
   // Clones |this| verbatim with ID field of the header regenerated.
   DnsQuery* CloneWithNewId() const;
 
   // DnsQuery field accessors.
   uint16 id() const;
   uint16 qtype() const;
 
   // Returns the size of the Question section of the query.  Used when
@@ skipping 20 matching lines @@
   void RandomizeId();
 
   // Size of the DNS name (*NOT* hostname) we are trying to resolve; used
   // to calculate offsets.
   size_t dns_name_size_;
 
   // Contains query bytes to be consumed by higher level Write() call.
   scoped_refptr<IOBufferWithSize> io_buffer_;
 
   // PRNG function for generating IDs.
-  uint64 (*prng_)();
+  RandIntCallback rand_int_;
 };
 
 }  // namespace net
 
 #endif  // NET_BASE_DNS_QUERY_H_