Switch to standard integer types in net/.

net/ssl/ssl_cipher_suite_names.cc

Index: net/ssl/ssl_cipher_suite_names.cc
diff --git a/net/ssl/ssl_cipher_suite_names.cc b/net/ssl/ssl_cipher_suite_names.cc
index fc99cfed410c8a0223aa042ea4c168c5f5106fdd..2bfe72ac93f9e2e0746db4c04c69f5b6111ab5ac 100644
--- a/net/ssl/ssl_cipher_suite_names.cc
+++ b/net/ssl/ssl_cipher_suite_names.cc
@@ -31,7 +31,7 @@
 namespace {
 
 struct CipherSuite {
-  uint16 cipher_suite, encoded;
+  uint16_t cipher_suite, encoded;
 };
 
 const struct CipherSuite kCipherSuites[] = {
@@ -277,7 +277,7 @@ int CipherSuiteCmp(const void* ia, const void* ib) {
   }
 }
 
-bool GetCipherProperties(uint16 cipher_suite,
+bool GetCipherProperties(uint16_t cipher_suite,
                          int* out_key_exchange,
                          int* out_cipher,
                          int* out_mac) {
@@ -303,8 +303,8 @@ namespace net {
 void SSLCipherSuiteToStrings(const char** key_exchange_str,
                              const char** cipher_str,
                              const char** mac_str,
-                             bool *is_aead,
-                             uint16 cipher_suite) {
+                             bool* is_aead,
+                             uint16_t cipher_suite) {
   *key_exchange_str = *cipher_str = *mac_str = "???";
   *is_aead = false;
 
@@ -350,19 +350,19 @@ void SSLVersionToString(const char** name, int ssl_version) {
 }
 
 bool ParseSSLCipherString(const std::string& cipher_string,
-                          uint16* cipher_suite) {
+                          uint16_t* cipher_suite) {
   int value = 0;
   if (cipher_string.size() == 6 &&
       base::StartsWith(cipher_string, "0x",
                        base::CompareCase::INSENSITIVE_ASCII) &&
       base::HexStringToInt(cipher_string, &value)) {
-    *cipher_suite = static_cast<uint16>(value);
+    *cipher_suite = static_cast<uint16_t>(value);
     return true;
   }
   return false;
 }
 
-bool IsSecureTLSCipherSuite(uint16 cipher_suite) {
+bool IsSecureTLSCipherSuite(uint16_t cipher_suite) {
   int key_exchange, cipher, mac;
   if (!GetCipherProperties(cipher_suite, &key_exchange, &cipher, &mac))
     return false;
@@ -392,7 +392,7 @@ bool IsSecureTLSCipherSuite(uint16 cipher_suite) {
   return true;
 }
 
-bool IsTLSCipherSuiteAllowedByHTTP2(uint16 cipher_suite) {
+bool IsTLSCipherSuiteAllowedByHTTP2(uint16_t cipher_suite) {
   int key_exchange, cipher, mac;
   if (!GetCipherProperties(cipher_suite, &key_exchange, &cipher, &mac))
     return false;
@@ -423,7 +423,7 @@ bool IsTLSCipherSuiteAllowedByHTTP2(uint16 cipher_suite) {
   return true;
 }
 
-const char* ECCurveName(uint16 cipher_suite, int key_exchange_info) {
+const char* ECCurveName(uint16_t cipher_suite, int key_exchange_info) {
 #if defined(USE_OPENSSL)
   int key_exchange, cipher, mac;
   if (!GetCipherProperties(cipher_suite, &key_exchange, &cipher, &mac))