Revert of Remove kuint16max.

net/test/spawned_test_server/remote_test_server.cc

Index: net/test/spawned_test_server/remote_test_server.cc
diff --git a/net/test/spawned_test_server/remote_test_server.cc b/net/test/spawned_test_server/remote_test_server.cc
index c563242bb3c66e9991178279c073eb5eb43e81da..0e1303e066c235b387fbeac524cb9afd8cdc8ff1 100644
--- a/net/test/spawned_test_server/remote_test_server.cc
+++ b/net/test/spawned_test_server/remote_test_server.cc
@@ -4,9 +4,6 @@
 
 #include "net/test/spawned_test_server/remote_test_server.h"
 
-#include <stdint.h>
-
-#include <limits>
 #include <vector>
 
 #include "base/base_paths.h"
@@ -111,7 +108,7 @@
     return false;
 
   // Start the Python test server on the remote machine.
-  uint16_t test_server_port;
+  uint16 test_server_port;
   if (!spawner_communicator_->StartServer(arguments_string,
                                           &test_server_port)) {
     return false;
@@ -187,15 +184,13 @@
   // Verify the ports information.
   base::StringToInt(ports[0], &spawner_server_port_);
   if (!spawner_server_port_ ||
-      static_cast<uint32_t>(spawner_server_port_) >=
-          std::numeric_limits<uint16_t>::max())
+      static_cast<uint32>(spawner_server_port_) >= kuint16max)
     return false;
 
   // Allow the test_server_port to be 0, which means the test server spawner
   // will pick up a random port to run the test server.
   base::StringToInt(ports[1], &test_server_port);
-  if (static_cast<uint32_t>(test_server_port) >=
-      std::numeric_limits<uint16_t>::max())
+  if (static_cast<uint32>(test_server_port) >= kuint16max)
     return false;
   SetPort(test_server_port);