Switch to standard integer types in net/.

net/test/spawned_test_server/local_test_server_posix.cc

 // Copyright (c) 2012 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/local_test_server.h"
 
 #include <poll.h>
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/process/kill.h"
 #include "base/process/launch.h"
 #include "base/process/process_iterator.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/test/test_timeouts.h"
 #include "net/test/python_utils.h"
 
 namespace {
 
@@ skipping 28 matching lines @@
 
  private:
   std::string path_string_;
   std::string port_string_;
   DISALLOW_COPY_AND_ASSIGN(OrphanedTestServerFilter);
 };
 
 // Given a file descriptor, reads into |buffer| until |bytes_max|
 // bytes has been read or an error has been encountered.  Returns true
 // if the read was successful.  |remaining_time| is used as a timeout.
-bool ReadData(int fd, ssize_t bytes_max, uint8* buffer,
+bool ReadData(int fd,
+              ssize_t bytes_max,
+              uint8_t* buffer,
               base::TimeDelta* remaining_time) {
   ssize_t bytes_read = 0;
   base::TimeTicks previous_time = base::TimeTicks::Now();
   while (bytes_read < bytes_max) {
     struct pollfd poll_fds[1];
 
     poll_fds[0].fd = fd;
     poll_fds[0].events = POLLIN | POLLPRI;
     poll_fds[0].revents = 0;
 
@@ skipping 72 matching lines @@
   }
 
   return true;
 }
 
 bool LocalTestServer::WaitToStart() {
   base::ScopedFD our_fd(child_fd_.release());
 
   base::TimeDelta remaining_time = TestTimeouts::action_timeout();
 
-  uint32 server_data_len = 0;
+  uint32_t server_data_len = 0;
   if (!ReadData(our_fd.get(), sizeof(server_data_len),
-                reinterpret_cast<uint8*>(&server_data_len),
+                reinterpret_cast<uint8_t*>(&server_data_len),
                 &remaining_time)) {
     LOG(ERROR) << "Could not read server_data_len";
     return false;
   }
   std::string server_data(server_data_len, '\0');
   if (!ReadData(our_fd.get(), server_data_len,
-                reinterpret_cast<uint8*>(&server_data[0]),
-                &remaining_time)) {
+                reinterpret_cast<uint8_t*>(&server_data[0]), &remaining_time)) {
     LOG(ERROR) << "Could not read server_data (" << server_data_len
                << " bytes)";
     return false;
   }
 
   if (!ParseServerData(server_data)) {
     LOG(ERROR) << "Could not parse server_data: " << server_data;
     return false;
   }
 
   return true;
 }
 
 }  // namespace net