Switch to standard integer types in base/.

base/containers/hash_tables_unittest.cc

Index: base/containers/hash_tables_unittest.cc
diff --git a/base/containers/hash_tables_unittest.cc b/base/containers/hash_tables_unittest.cc
index f775dff15a8be1627edf03e52337aabffa2c4ced..6072e5dc91e076a23e8b68a23644e4252f9e0d27 100644
--- a/base/containers/hash_tables_unittest.cc
+++ b/base/containers/hash_tables_unittest.cc
@@ -7,7 +7,6 @@
 #include <stdint.h>
 #include <string>
 
-#include "base/basictypes.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ -25,27 +24,27 @@ class HashPairTest : public testing::Test {
 // Verify that a hash_map can be constructed for pairs of integers of various
 // sizes.
 TEST_F(HashPairTest, IntegerPairs) {
-  typedef std::pair<int16, int16> Int16Int16Pair;
-  typedef std::pair<int16, int32> Int16Int32Pair;
-  typedef std::pair<int16, int64> Int16Int64Pair;
+  typedef std::pair<int16_t, int16_t> Int16Int16Pair;
+  typedef std::pair<int16_t, int32_t> Int16Int32Pair;
+  typedef std::pair<int16_t, int64_t> Int16Int64Pair;
 
   INSERT_PAIR_TEST(Int16Int16Pair, 4, 6);
   INSERT_PAIR_TEST(Int16Int32Pair, 9, (1 << 29) + 378128932);
   INSERT_PAIR_TEST(Int16Int64Pair, 10,
                    (INT64_C(1) << 60) + INT64_C(78931732321));
 
-  typedef std::pair<int32, int16> Int32Int16Pair;
-  typedef std::pair<int32, int32> Int32Int32Pair;
-  typedef std::pair<int32, int64> Int32Int64Pair;
+  typedef std::pair<int32_t, int16_t> Int32Int16Pair;
+  typedef std::pair<int32_t, int32_t> Int32Int32Pair;
+  typedef std::pair<int32_t, int64_t> Int32Int64Pair;
 
   INSERT_PAIR_TEST(Int32Int16Pair, 4, 6);
   INSERT_PAIR_TEST(Int32Int32Pair, 9, (1 << 29) + 378128932);
   INSERT_PAIR_TEST(Int32Int64Pair, 10,
                    (INT64_C(1) << 60) + INT64_C(78931732321));
 
-  typedef std::pair<int64, int16> Int64Int16Pair;
-  typedef std::pair<int64, int32> Int64Int32Pair;
-  typedef std::pair<int64, int64> Int64Int64Pair;
+  typedef std::pair<int64_t, int16_t> Int64Int16Pair;
+  typedef std::pair<int64_t, int32_t> Int64Int32Pair;
+  typedef std::pair<int64_t, int64_t> Int64Int64Pair;
 
   INSERT_PAIR_TEST(Int64Int16Pair, 4, 6);
   INSERT_PAIR_TEST(Int64Int32Pair, 9, (1 << 29) + 378128932);