Switch to standard integer types in chrome/.

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 <stddef.h>
+#include <stdint.h>
+#include <string.h>
+
 #include <string>
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/location.h"
 #include "base/single_thread_task_runner.h"
 #include "base/sync_socket.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "base/time/time.h"
+#include "build/build_config.h"
 #include "chrome/test/chromedriver/chrome/status.h"
 #include "chrome/test/chromedriver/net/port_server.h"
 #include "net/base/sys_addrinfo.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_LINUX)
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 #endif
@@ skipping 109 matching lines @@
   base::Thread thread_;
 };
 
 TEST_F(PortServerTest, Reserve) {
   std::string path = GenerateRandomPath();
   PortServer server(path);
 
   std::string request;
   RunServer(path, "12345\n", &request);
 
-  uint16 port = 0;
+  uint16_t port = 0;
   scoped_ptr<PortReservation> reservation;
   Status status = server.ReservePort(&port, &reservation);
   ASSERT_EQ(kOk, status.code()) << status.message();
   ASSERT_EQ(12345u, port);
 }
 
 TEST_F(PortServerTest, ReserveResetReserve) {
   std::string path = GenerateRandomPath();
   PortServer server(path);
 
   std::string request;
   RunServer(path, "12345\n", &request);
 
-  uint16 port = 0;
+  uint16_t port = 0;
   scoped_ptr<PortReservation> reservation;
   Status status = server.ReservePort(&port, &reservation);
   ASSERT_EQ(kOk, status.code()) << status.message();
   ASSERT_EQ(12345u, port);
 
   reservation.reset();
   status = server.ReservePort(&port, &reservation);
   ASSERT_EQ(kOk, status.code()) << status.message();
   ASSERT_EQ(12345u, port);
 }
 
 TEST_F(PortServerTest, ReserveReserve) {
   std::string path = GenerateRandomPath();
   PortServer server(path);
 
   std::string request;
   RunServer(path, "12345\n", &request);
 
-  uint16 port = 0;
+  uint16_t port = 0;
   scoped_ptr<PortReservation> reservation;
   Status status = server.ReservePort(&port, &reservation);
   ASSERT_EQ(kOk, status.code()) << status.message();
   ASSERT_EQ(12345u, port);
 
   RunServer(path, "12346\n", &request);
   status = server.ReservePort(&port, &reservation);
   ASSERT_EQ(kOk, status.code()) << status.message();
   ASSERT_EQ(12346u, port);
 }
 #endif
 
 TEST(PortManagerTest, ReservePort) {
   PortManager mgr(15000, 16000);
-  uint16 port = 0;
+  uint16_t 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);
-  uint16 first_port = 0, port = 1;
+  uint16_t 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);
   }
 }