Switch to standard integer types in remoting/.

remoting/protocol/chromium_socket_factory.cc

 // Copyright 2014 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 "remoting/protocol/chromium_socket_factory.h"
 
+#include <stddef.h>
+
 #include "base/bind.h"
 #include "base/logging.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "jingle/glue/utils.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/udp/udp_server_socket.h"
 #include "remoting/protocol/socket_util.h"
 #include "third_party/webrtc/base/asyncpacketsocket.h"
 #include "third_party/webrtc/base/nethelpers.h"
 
@@ skipping 10 matching lines @@
 // Pepper's UDP API can handle it. This maximum should never be
 // reached under normal conditions.
 const int kMaxSendBufferSize = 256 * 1024;
 
 class UdpPacketSocket : public rtc::AsyncPacketSocket {
  public:
   UdpPacketSocket();
   ~UdpPacketSocket() override;
 
   bool Init(const rtc::SocketAddress& local_address,
-            uint16 min_port, uint16 max_port);
+            uint16_t min_port,
+            uint16_t max_port);
 
   // rtc::AsyncPacketSocket interface.
   rtc::SocketAddress GetLocalAddress() const override;
   rtc::SocketAddress GetRemoteAddress() const override;
   int Send(const void* data,
            size_t data_size,
            const rtc::PacketOptions& options) override;
   int SendTo(const void* data,
              size_t data_size,
              const rtc::SocketAddress& address,
@@ skipping 58 matching lines @@
       error_(0),
       send_pending_(false),
       send_queue_size_(0) {
 }
 
 UdpPacketSocket::~UdpPacketSocket() {
   Close();
 }
 
 bool UdpPacketSocket::Init(const rtc::SocketAddress& local_address,
-                           uint16 min_port, uint16 max_port) {
+                           uint16_t min_port,
+                           uint16_t max_port) {
   net::IPEndPoint local_endpoint;
   if (!jingle_glue::SocketAddressToIPEndPoint(
           local_address, &local_endpoint)) {
     return false;
   }
 
-  for (uint32 port = min_port; port <= max_port; ++port) {
+  for (uint32_t port = min_port; port <= max_port; ++port) {
     socket_.reset(new net::UDPServerSocket(nullptr, net::NetLog::Source()));
     int result = socket_->Listen(
-        net::IPEndPoint(local_endpoint.address(), static_cast<uint16>(port)));
+        net::IPEndPoint(local_endpoint.address(), static_cast<uint16_t>(port)));
     if (result == net::OK) {
       break;
     } else {
       socket_.reset();
     }
   }
 
   if (!socket_.get()) {
     // Failed to bind the socket.
     return false;
@@ skipping 214 matching lines @@
 
 }  // namespace
 
 ChromiumPacketSocketFactory::ChromiumPacketSocketFactory() {
 }
 
 ChromiumPacketSocketFactory::~ChromiumPacketSocketFactory() {
 }
 
 rtc::AsyncPacketSocket* ChromiumPacketSocketFactory::CreateUdpSocket(
-      const rtc::SocketAddress& local_address,
-      uint16 min_port, uint16 max_port) {
+    const rtc::SocketAddress& local_address,
+    uint16_t min_port,
+    uint16_t max_port) {
   scoped_ptr<UdpPacketSocket> result(new UdpPacketSocket());
   if (!result->Init(local_address, min_port, max_port))
     return nullptr;
   return result.release();
 }
 
-rtc::AsyncPacketSocket*
-ChromiumPacketSocketFactory::CreateServerTcpSocket(
+rtc::AsyncPacketSocket* ChromiumPacketSocketFactory::CreateServerTcpSocket(
     const rtc::SocketAddress& local_address,
-    uint16 min_port, uint16 max_port,
+    uint16_t min_port,
+    uint16_t max_port,
     int opts) {
   // We don't use TCP sockets for remoting connections.
   NOTIMPLEMENTED();
   return nullptr;
 }
 
 rtc::AsyncPacketSocket*
 ChromiumPacketSocketFactory::CreateClientTcpSocket(
       const rtc::SocketAddress& local_address,
       const rtc::SocketAddress& remote_address,
       const rtc::ProxyInfo& proxy_info,
       const std::string& user_agent,
       int opts) {
   // We don't use TCP sockets for remoting connections.
   NOTREACHED();
   return nullptr;
 }
 
 rtc::AsyncResolverInterface*
 ChromiumPacketSocketFactory::CreateAsyncResolver() {
   return new rtc::AsyncResolver();
 }
 
 }  // namespace protocol
 }  // namespace remoting