Switch to standard integer types in net/.

net/ssl/ssl_cipher_suite_names_unittest.cc

 // Copyright (c) 2011 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 "net/ssl/ssl_cipher_suite_names.h"
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace net {
 
 namespace {
 
 TEST(CipherSuiteNamesTest, Basic) {
   const char *key_exchange, *cipher, *mac;
   bool is_aead;
 
@@ skipping 23 matching lines @@
   EXPECT_EQ(NULL, mac);
 
   SSLCipherSuiteToStrings(&key_exchange, &cipher, &mac, &is_aead, 0xff31);
   EXPECT_STREQ("???", key_exchange);
   EXPECT_STREQ("???", cipher);
   EXPECT_STREQ("???", mac);
   EXPECT_FALSE(is_aead);
 }
 
 TEST(CipherSuiteNamesTest, ParseSSLCipherString) {
-  uint16 cipher_suite = 0;
+  uint16_t cipher_suite = 0;
   EXPECT_TRUE(ParseSSLCipherString("0x0004", &cipher_suite));
   EXPECT_EQ(0x00004u, cipher_suite);
 
   EXPECT_TRUE(ParseSSLCipherString("0xBEEF", &cipher_suite));
   EXPECT_EQ(0xBEEFu, cipher_suite);
 }
 
 TEST(CipherSuiteNamesTest, ParseSSLCipherStringFails) {
   const char* const cipher_strings[] = {
     "0004",
     "0x004",
     "0xBEEFY",
   };
 
   for (size_t i = 0; i < arraysize(cipher_strings); ++i) {
-    uint16 cipher_suite = 0;
+    uint16_t cipher_suite = 0;
     EXPECT_FALSE(ParseSSLCipherString(cipher_strings[i], &cipher_suite));
   }
 }
 
 TEST(CipherSuiteNamesTest, SecureCipherSuites) {
   // Picked some random cipher suites.
   EXPECT_FALSE(IsSecureTLSCipherSuite(0x0 /* TLS_NULL_WITH_NULL_NULL */));
   EXPECT_FALSE(
       IsSecureTLSCipherSuite(0x39 /* TLS_DHE_RSA_WITH_AES_256_CBC_SHA */));
   EXPECT_FALSE(IsSecureTLSCipherSuite(
@@ skipping 56 matching lines @@
       0xcc14 /* ECDHE_ECDSA_WITH_CHACHA20_POLY1305 (non-standard) */));
   EXPECT_TRUE(IsTLSCipherSuiteAllowedByHTTP2(
       0xcca8 /* ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 */));
   EXPECT_TRUE(IsTLSCipherSuiteAllowedByHTTP2(
       0xcca9 /* ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256 */));
 }
 
 }  // anonymous namespace
 
 }  // namespace net