Revert of Remove kuint16max.

net/test/spawned_test_server/base_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/base_test_server.h"
 
-#include <stdint.h>
-
-#include <limits>
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/files/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/values.h"
 #include "net/base/address_list.h"
@@ skipping 261 matching lines @@
                              BoundNetLog());
   if (rv == ERR_IO_PENDING)
     rv = callback.WaitForResult();
   if (rv != OK) {
     LOG(ERROR) << "Failed to resolve hostname: " << host_port_pair_.host();
     return false;
   }
   return true;
 }
 
-uint16_t BaseTestServer::GetPort() {
+uint16 BaseTestServer::GetPort() {
   return host_port_pair_.port();
 }
 
-void BaseTestServer::SetPort(uint16_t port) {
+void BaseTestServer::SetPort(uint16 port) {
   host_port_pair_.set_port(port);
 }
 
 GURL BaseTestServer::GetURL(const std::string& path) const {
   return GURL(GetScheme() + "://" + host_port_pair_.ToString() + "/" + path);
 }
 
 GURL BaseTestServer::GetURLWithUser(const std::string& path,
                                 const std::string& user) const {
   return GURL(GetScheme() + "://" + user + "@" + host_port_pair_.ToString() +
@@ skipping 104 matching lines @@
                << json_reader.GetErrorMessage();
     return false;
   }
 
   server_data_.reset(static_cast<base::DictionaryValue*>(value.release()));
   int port = 0;
   if (!server_data_->GetInteger("port", &port)) {
     LOG(ERROR) << "Could not find port value";
     return false;
   }
-  if ((port <= 0) || (port > std::numeric_limits<uint16_t>::max())) {
+  if ((port <= 0) || (port > kuint16max)) {
     LOG(ERROR) << "Invalid port value: " << port;
     return false;
   }
   host_port_pair_.set_port(port);
 
   return true;
 }
 
 bool BaseTestServer::SetupWhenServerStarted() {
   DCHECK(host_port_pair_.port());
@@ skipping 150 matching lines @@
 
   return GenerateAdditionalArguments(arguments);
 }
 
 bool BaseTestServer::GenerateAdditionalArguments(
     base::DictionaryValue* arguments) const {
   return true;
 }
 
 }  // namespace net