Switch to standard integer types in extensions/browser/.

extensions/browser/api/socket/tls_socket.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 "extensions/browser/api/socket/tls_socket.h"
 
 #include <utility>
 
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "extensions/browser/api/api_resource.h"
 #include "net/base/address_list.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_util.h"
 #include "net/base/rand_callback.h"
 #include "net/socket/client_socket_factory.h"
 #include "net/socket/client_socket_handle.h"
 #include "net/socket/ssl_client_socket.h"
 #include "net/socket/tcp_client_socket.h"
 #include "url/url_canon.h"
 
 namespace {
 
-// Returns the SSL protocol version (as a uint16) represented by a string.
+// Returns the SSL protocol version (as a uint16_t) represented by a string.
 // Returns 0 if the string is invalid.
-uint16 SSLProtocolVersionFromString(const std::string& version_str) {
-  uint16 version = 0;  // Invalid.
+uint16_t SSLProtocolVersionFromString(const std::string& version_str) {
+  uint16_t version = 0;  // Invalid.
   if (version_str == "tls1") {
     version = net::SSL_PROTOCOL_VERSION_TLS1;
   } else if (version_str == "tls1.1") {
     version = net::SSL_PROTOCOL_VERSION_TLS1_1;
   } else if (version_str == "tls1.2") {
     version = net::SSL_PROTOCOL_VERSION_TLS1_2;
   }
   return version;
 }
 
@@ skipping 102 matching lines @@
 
 bool TLSSocket::SetKeepAlive(bool enable, int delay) {
   return false;
 }
 
 bool TLSSocket::SetNoDelay(bool no_delay) {
   return false;
 }
 
 int TLSSocket::Listen(const std::string& address,
-                      uint16 port,
+                      uint16_t port,
                       int backlog,
                       std::string* error_msg) {
   *error_msg = kTLSSocketTypeInvalidError;
   return net::ERR_NOT_IMPLEMENTED;
 }
 
 void TLSSocket::Accept(const AcceptCompletionCallback& callback) {
   callback.Run(net::ERR_FAILED, NULL);
 }
 
@@ skipping 77 matching lines @@
 
   DCHECK(transport_security_state);
   net::SSLClientSocketContext context;
   context.cert_verifier = cert_verifier;
   context.transport_security_state = transport_security_state;
 
   // Fill in the SSL socket params.
   net::SSLConfig ssl_config;
   ssl_config_service->GetSSLConfig(&ssl_config);
   if (options && options->tls_version.get()) {
-    uint16 version_min = 0, version_max = 0;
+    uint16_t version_min = 0, version_max = 0;
     api::socket::TLSVersionConstraints* versions = options->tls_version.get();
     if (versions->min.get()) {
       version_min = SSLProtocolVersionFromString(*versions->min.get());
     }
     if (versions->max.get()) {
       version_max = SSLProtocolVersionFromString(*versions->max.get());
     }
     if (version_min) {
       ssl_config.version_min = version_min;
     }
@@ skipping 39 matching lines @@
     if (status != net::OK) {
       DVLOG(1) << "Status is not OK or IO-pending: "
                << net::ErrorToString(status);
     }
     connect_cb.Run(status);
   }
 }
 
 }  // namespace extensions