Index: extensions/browser/api/socket/socket_api.cc |
diff --git a/extensions/browser/api/socket/socket_api.cc b/extensions/browser/api/socket/socket_api.cc |
index 2cb37e783788147b05b187dca21d311ee5d9c774..156449ff63d830a95879cc234ffc0255d5b86074 100644 |
--- a/extensions/browser/api/socket/socket_api.cc |
+++ b/extensions/browser/api/socket/socket_api.cc |
@@ -8,6 +8,7 @@ |
#include "base/bind.h" |
#include "base/containers/hash_tables.h" |
+#include "build/build_config.h" |
#include "content/public/browser/browser_context.h" |
#include "content/public/browser/resource_context.h" |
#include "extensions/browser/api/dns/host_resolver_wrapper.h" |
@@ -55,7 +56,7 @@ const char kMulticastSocketTypeError[] = "Only UDP socket supports multicast."; |
const char kSecureSocketTypeError[] = "Only TCP sockets are supported for TLS."; |
const char kSocketNotConnectedError[] = "Socket not connected"; |
const char kWildcardAddress[] = "*"; |
-const uint16 kWildcardPort = 0; |
+const uint16_t kWildcardPort = 0; |
#if defined(OS_CHROMEOS) |
const char kFirewallFailure[] = "Failed to open firewall port"; |
@@ -268,7 +269,7 @@ bool SocketConnectFunction::Prepare() { |
int port; |
EXTENSION_FUNCTION_VALIDATE( |
args_->GetInteger(2, &port) && port >= 0 && port <= 65535); |
- port_ = static_cast<uint16>(port); |
+ port_ = static_cast<uint16_t>(port); |
return true; |
} |
@@ -356,7 +357,7 @@ bool SocketBindFunction::Prepare() { |
int port; |
EXTENSION_FUNCTION_VALIDATE( |
args_->GetInteger(2, &port) && port >= 0 && port <= 65535); |
- port_ = static_cast<uint16>(port); |
+ port_ = static_cast<uint16_t>(port); |
return true; |
} |
@@ -571,7 +572,7 @@ void SocketRecvFromFunction::AsyncWorkStart() { |
void SocketRecvFromFunction::OnCompleted(int bytes_read, |
scoped_refptr<net::IOBuffer> io_buffer, |
const std::string& address, |
- uint16 port) { |
+ uint16_t port) { |
base::DictionaryValue* result = new base::DictionaryValue(); |
result->SetInteger(kResultCodeKey, bytes_read); |
if (bytes_read > 0) { |
@@ -602,7 +603,7 @@ bool SocketSendToFunction::Prepare() { |
int port; |
EXTENSION_FUNCTION_VALIDATE( |
args_->GetInteger(3, &port) && port >= 0 && port <= 65535); |
- port_ = static_cast<uint16>(port); |
+ port_ = static_cast<uint16_t>(port); |
io_buffer_size_ = data->GetSize(); |
io_buffer_ = new net::WrappedIOBuffer(data->GetBuffer()); |