Use uint16 for port numbers more pervasively.

chrome/test/chromedriver/net/port_server_unittest.cc

Index: chrome/test/chromedriver/net/port_server_unittest.cc
diff --git a/chrome/test/chromedriver/net/port_server_unittest.cc b/chrome/test/chromedriver/net/port_server_unittest.cc
index dd9fad4bb919ede03709a3b0364bc8a8fd14bd85..cc6e4d19a835ac5da6d816d944fd405c8ff4d2a0 100644
--- a/chrome/test/chromedriver/net/port_server_unittest.cc
+++ b/chrome/test/chromedriver/net/port_server_unittest.cc
@@ -142,11 +142,11 @@ TEST_F(PortServerTest, Reserve) {
   std::string request;
   RunServer(path, "12345\n", &request);
 
-  int port = 0;
+  uint16 port = 0;
   scoped_ptr<PortReservation> reservation;
   Status status = server.ReservePort(&port, &reservation);
   ASSERT_EQ(kOk, status.code()) << status.message();
-  ASSERT_EQ(port, 12345);
+  ASSERT_EQ(12345u, port);
 }
 
 TEST_F(PortServerTest, ReserveResetReserve) {
@@ -156,16 +156,16 @@ TEST_F(PortServerTest, ReserveResetReserve) {
   std::string request;
   RunServer(path, "12345\n", &request);
 
-  int port = 0;
+  uint16 port = 0;
   scoped_ptr<PortReservation> reservation;
   Status status = server.ReservePort(&port, &reservation);
   ASSERT_EQ(kOk, status.code()) << status.message();
-  ASSERT_EQ(port, 12345);
+  ASSERT_EQ(12345u, port);
 
   reservation.reset();
   status = server.ReservePort(&port, &reservation);
   ASSERT_EQ(kOk, status.code()) << status.message();
-  ASSERT_EQ(port, 12345);
+  ASSERT_EQ(12345u, port);
 }
 
 TEST_F(PortServerTest, ReserveReserve) {
@@ -175,22 +175,22 @@ TEST_F(PortServerTest, ReserveReserve) {
   std::string request;
   RunServer(path, "12345\n", &request);
 
-  int port = 0;
+  uint16 port = 0;
   scoped_ptr<PortReservation> reservation;
   Status status = server.ReservePort(&port, &reservation);
   ASSERT_EQ(kOk, status.code()) << status.message();
-  ASSERT_EQ(port, 12345);
+  ASSERT_EQ(12345u, port);
 
   RunServer(path, "12346\n", &request);
   status = server.ReservePort(&port, &reservation);
   ASSERT_EQ(kOk, status.code()) << status.message();
-  ASSERT_EQ(port, 12346);
+  ASSERT_EQ(12345u, port);
 }
 #endif
 
 TEST(PortManagerTest, ReservePort) {
   PortManager mgr(15000, 16000);
-  int port = 0;
+  uint16 port = 0;
   scoped_ptr<PortReservation> reservation;
   Status status = mgr.ReservePort(&port, &reservation);
   ASSERT_EQ(kOk, status.code()) << status.message();
@@ -202,7 +202,7 @@ TEST(PortManagerTest, ReservePort) {
 
 TEST(PortManagerTest, ReservePortFromPool) {
   PortManager mgr(15000, 16000);
-  int first_port = 0, port = 1;
+  uint16 first_port = 0, port = 1;
   for (int i = 0; i < 10; i++) {
     scoped_ptr<PortReservation> reservation;
     Status status = mgr.ReservePortFromPool(&port, &reservation);