Switch to standard integer types in extensions/browser/.

extensions/browser/api/socket/socket.h

 // 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.
 
 #ifndef EXTENSIONS_BROWSER_API_SOCKET_SOCKET_H_
 #define EXTENSIONS_BROWSER_API_SOCKET_SOCKET_H_
 
+#include <stdint.h>
+
 #include <queue>
 #include <string>
 #include <utility>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
+#include "build/build_config.h"
 #include "extensions/browser/api/api_resource.h"
 #include "extensions/browser/api/api_resource_manager.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/socket/tcp_client_socket.h"
 
 #if defined(OS_CHROMEOS)
 #include "extensions/browser/api/socket/app_firewall_hole_manager.h"
 #endif  // OS_CHROMEOS
 
 namespace net {
 class AddressList;
 class IPEndPoint;
 class Socket;
 }
 
 namespace extensions {
 
 typedef base::Callback<void(int)> CompletionCallback;
 typedef base::Callback<void(int, scoped_refptr<net::IOBuffer> io_buffer)>
     ReadCompletionCallback;
 typedef base::Callback<void(int,
                             scoped_refptr<net::IOBuffer> io_buffer,
                             const std::string&,
-                            uint16)> RecvFromCompletionCallback;
+                            uint16_t)> RecvFromCompletionCallback;
 typedef base::Callback<void(int, net::TCPClientSocket*)>
     AcceptCompletionCallback;
 
 // A Socket wraps a low-level socket and includes housekeeping information that
 // we need to manage it in the context of an extension.
 class Socket : public ApiResource {
  public:
   enum SocketType { TYPE_TCP, TYPE_UDP, TYPE_TLS };
 
   ~Socket() override;
@@ skipping 16 matching lines @@
     firewall_hole_ = firewall_hole.Pass();
   }
 #endif  // OS_CHROMEOS
 
   // Note: |address| contains the resolved IP address, not the hostname of
   // the remote endpoint. In order to upgrade this socket to TLS, callers
   // must also supply the hostname of the endpoint via set_hostname().
   virtual void Connect(const net::AddressList& address,
                        const CompletionCallback& callback) = 0;
   virtual void Disconnect() = 0;
-  virtual int Bind(const std::string& address, uint16 port) = 0;
+  virtual int Bind(const std::string& address, uint16_t port) = 0;
 
   // The |callback| will be called with the number of bytes read into the
   // buffer, or a negative number if an error occurred.
   virtual void Read(int count, const ReadCompletionCallback& callback) = 0;
 
   // The |callback| will be called with |byte_count| or a negative number if an
   // error occurred.
   void Write(scoped_refptr<net::IOBuffer> io_buffer,
              int byte_count,
              const CompletionCallback& callback);
 
   virtual void RecvFrom(int count,
                         const RecvFromCompletionCallback& callback) = 0;
   virtual void SendTo(scoped_refptr<net::IOBuffer> io_buffer,
                       int byte_count,
                       const net::IPEndPoint& address,
                       const CompletionCallback& callback) = 0;
 
   virtual bool SetKeepAlive(bool enable, int delay);
   virtual bool SetNoDelay(bool no_delay);
   virtual int Listen(const std::string& address,
-                     uint16 port,
+                     uint16_t port,
                      int backlog,
                      std::string* error_msg);
   virtual void Accept(const AcceptCompletionCallback& callback);
 
   virtual bool IsConnected() = 0;
 
   virtual bool GetPeerAddress(net::IPEndPoint* address) = 0;
   virtual bool GetLocalAddress(net::IPEndPoint* address) = 0;
 
   virtual SocketType GetSocketType() const = 0;
 
   static bool StringAndPortToIPEndPoint(const std::string& ip_address_str,
-                                        uint16 port,
+                                        uint16_t port,
                                         net::IPEndPoint* ip_end_point);
   static void IPEndPointToStringAndPort(const net::IPEndPoint& address,
                                         std::string* ip_address_str,
-                                        uint16* port);
+                                        uint16_t* port);
 
  protected:
   explicit Socket(const std::string& owner_extension_id_);
 
   void WriteData();
   virtual int WriteImpl(net::IOBuffer* io_buffer,
                         int io_buffer_size,
                         const net::CompletionCallback& callback) = 0;
   virtual void OnWriteComplete(int result);
 
@@ skipping 20 matching lines @@
 #if defined(OS_CHROMEOS)
   // Represents a hole punched in the system firewall for this socket.
   scoped_ptr<AppFirewallHole, content::BrowserThread::DeleteOnUIThread>
       firewall_hole_;
 #endif  // OS_CHROMEOS
 };
 
 }  //  namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_SOCKET_SOCKET_H_