Revert of Remove kuint16max.

net/test/spawned_test_server/remote_test_server.cc

 // Copyright 2013 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 "net/test/spawned_test_server/remote_test_server.h"
 
-#include <stdint.h>
-
-#include <limits>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
@@ skipping 84 matching lines @@
   // pass right server type to Python test server.
   arguments_dict.SetString("server-type", GetServerTypeString(type()));
 
   // Generate JSON-formatted argument string.
   std::string arguments_string;
   base::JSONWriter::Write(arguments_dict, &arguments_string);
   if (arguments_string.empty())
     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;
   }
   if (0 == test_server_port)
     return false;
 
   // Construct server data to initialize BaseTestServer::server_data_.
   base::DictionaryValue server_data_dict;
   // At this point, the test server should be spawned on the host. Update the
@@ skipping 55 matching lines @@
   }
 
   std::vector<std::string> ports = base::SplitString(
       port_info, ":", base::TRIM_WHITESPACE, base::SPLIT_WANT_ALL);
   if (ports.size() != 2u)
     return false;
 
   // 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);
 
   // Unlike LocalTestServer, RemoteTestServer passes relative paths to the test
   // server. The test server fails on empty strings in some configurations.
   base::FilePath fixed_root = document_root;
   if (fixed_root.empty())
     fixed_root = base::FilePath(base::FilePath::kCurrentDirectory);
   SetResourcePath(fixed_root, base::FilePath().AppendASCII("net")
                                            .AppendASCII("data")
                                            .AppendASCII("ssl")
                                            .AppendASCII("certificates"));
   return true;
 }
 
 }  // namespace net