Revert of Remove kuint16max.

net/tools/dns_fuzz_stub/dns_fuzz_stub.cc

Index: net/tools/dns_fuzz_stub/dns_fuzz_stub.cc
diff --git a/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc b/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc
index 2a2c88e9e589fec7a86f0f09c1f735b46cef968e..5bb6e117f78b5861eac5ef4aa82e9b33a295be94 100644
--- a/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc
+++ b/net/tools/dns_fuzz_stub/dns_fuzz_stub.cc
@@ -2,14 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include <stdint.h>
-
 #include <algorithm>
-#include <limits>
 #include <sstream>
 #include <string>
 #include <vector>
 
+#include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
@@ -41,17 +39,15 @@
 }
 
 bool FitsUint8(int num) {
-  return (num >= 0) && (num <= std::numeric_limits<uint8_t>::max());
+  return (num >= 0) && (num <= kuint8max);
 }
 
 bool FitsUint16(int num) {
-  return (num >= 0) && (num <= std::numeric_limits<uint16_t>::max());
+  return (num >= 0) && (num <= kuint16max);
 }
 
 bool ReadTestCase(const char* filename,
-                  uint16_t* id,
-                  std::string* qname,
-                  uint16_t* qtype,
+                  uint16* id, std::string* qname, uint16* qtype,
                   std::vector<char>* resp_buf,
                   bool* crash_test) {
   base::FilePath filepath = base::FilePath::FromUTF8Unsafe(filename);
@@ -89,7 +85,7 @@
     LOG(ERROR) << filename << ": id is out of range.";
     return false;
   }
-  *id = static_cast<uint16_t>(id_int);
+  *id = static_cast<uint16>(id_int);
 
   if (!dict->GetStringASCII("qname", qname)) {
     LOG(ERROR) << filename << ": qname is missing or not a string.";
@@ -105,7 +101,7 @@
     LOG(ERROR) << filename << ": qtype is out of range.";
     return false;
   }
-  *qtype = static_cast<uint16_t>(qtype_int);
+  *qtype = static_cast<uint16>(qtype_int);
 
   base::ListValue* resp_list;
   if (!dict->GetList("response", &resp_list)) {
@@ -138,9 +134,7 @@
   return true;
 }
 
-void RunTestCase(uint16_t id,
-                 std::string& qname,
-                 uint16_t qtype,
+void RunTestCase(uint16 id, std::string& qname, uint16 qtype,
                  std::vector<char>& resp_buf) {
   net::DnsQuery query(id, qname, qtype);
   net::DnsResponse response;
@@ -171,9 +165,9 @@
 }
 
 bool ReadAndRunTestCase(const char* filename) {
-  uint16_t id = 0;
+  uint16 id = 0;
   std::string qname;
-  uint16_t qtype = 0;
+  uint16 qtype = 0;
   std::vector<char> resp_buf;
   bool crash_test = false;