Use uint16 for port numbers more pervasively.

chrome/test/chromedriver/net/port_server_unittest.cc

 // Copyright (c) 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 <string>
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 124 matching lines @@
   base::Thread thread_;
 };
 
 TEST_F(PortServerTest, Reserve) {
   std::string path = GenerateRandomPath();
   PortServer server(path);
 
   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) {
   std::string path = GenerateRandomPath();
   PortServer server(path);
 
   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) {
   std::string path = GenerateRandomPath();
   PortServer server(path);
 
   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();
 
   ASSERT_GE(port, 15000);
   ASSERT_LE(port, 16000);
   ASSERT_TRUE(reservation);
 }
 
 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);
     ASSERT_EQ(kOk, status.code()) << status.message();
     ASSERT_TRUE(reservation);
     ASSERT_GE(port, 15000);
     ASSERT_LE(port, 16000);
     if (i == 0)
       first_port = port;
     ASSERT_EQ(port, first_port);
   }
 }