Index: net/test/spawned_test_server/base_test_server.cc |
diff --git a/net/test/spawned_test_server/base_test_server.cc b/net/test/spawned_test_server/base_test_server.cc |
index d245cc2e21879e8801408a7c352f66ed57d1d4c1..f45ef4a6fc140b4915f412702d8ae7ec5900ed91 100644 |
--- a/net/test/spawned_test_server/base_test_server.cc |
+++ b/net/test/spawned_test_server/base_test_server.cc |
@@ -4,6 +4,9 @@ |
#include "net/test/spawned_test_server/base_test_server.h" |
+#include <stdint.h> |
+ |
+#include <limits> |
#include <string> |
#include <vector> |
@@ -285,11 +288,11 @@ bool BaseTestServer::GetAddressList(AddressList* address_list) const { |
return true; |
} |
-uint16 BaseTestServer::GetPort() { |
+uint16_t BaseTestServer::GetPort() { |
return host_port_pair_.port(); |
} |
-void BaseTestServer::SetPort(uint16 port) { |
+void BaseTestServer::SetPort(uint16_t port) { |
host_port_pair_.set_port(port); |
} |
@@ -414,7 +417,7 @@ bool BaseTestServer::ParseServerData(const std::string& server_data) { |
LOG(ERROR) << "Could not find port value"; |
return false; |
} |
- if ((port <= 0) || (port > kuint16max)) { |
+ if ((port <= 0) || (port > std::numeric_limits<uint16_t>::max())) { |
LOG(ERROR) << "Invalid port value: " << port; |
return false; |
} |