Switch to standard integer types in net/.

net/dns/dns_query.h

Index: net/dns/dns_query.h
diff --git a/net/dns/dns_query.h b/net/dns/dns_query.h
index c3104c355f2802a449486d0d2803aa49cfc15117..14c5b5be8cc467f5007e5e1999627d05e316c4d5 100644
--- a/net/dns/dns_query.h
+++ b/net/dns/dns_query.h
@@ -5,7 +5,10 @@
 #ifndef NET_DNS_DNS_QUERY_H_
 #define NET_DNS_DNS_QUERY_H_
 
-#include "base/basictypes.h"
+#include <stddef.h>
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
@@ -21,16 +24,16 @@ class NET_EXPORT_PRIVATE DnsQuery {
  public:
   // Constructs a query message from |qname| which *MUST* be in a valid
   // DNS name format, and |qtype|. The qclass is set to IN.
-  DnsQuery(uint16 id, const base::StringPiece& qname, uint16 qtype);
+  DnsQuery(uint16_t id, const base::StringPiece& qname, uint16_t qtype);
   ~DnsQuery();
 
   // Clones |this| verbatim, with ID field of the header set to |id|.
-  scoped_ptr<DnsQuery> CloneWithNewId(uint16 id) const;
+  scoped_ptr<DnsQuery> CloneWithNewId(uint16_t id) const;
 
   // DnsQuery field accessors.
-  uint16 id() const;
+  uint16_t id() const;
   base::StringPiece qname() const;
-  uint16 qtype() const;
+  uint16_t qtype() const;
 
   // Returns the Question section of the query.  Used when matching the
   // response.
@@ -39,10 +42,10 @@ class NET_EXPORT_PRIVATE DnsQuery {
   // IOBuffer accessor to be used for writing out the query.
   IOBufferWithSize* io_buffer() const { return io_buffer_.get(); }
 
-  void set_flags(uint16 flags);
+  void set_flags(uint16_t flags);
 
  private:
-  DnsQuery(const DnsQuery& orig, uint16 id);
+  DnsQuery(const DnsQuery& orig, uint16_t id);
 
   // Size of the DNS name (*NOT* hostname) we are trying to resolve; used
   // to calculate offsets.