Switch to standard integer types in media/.

media/formats/mp2t/timestamp_unroller_unittest.cc

Index: media/formats/mp2t/timestamp_unroller_unittest.cc
diff --git a/media/formats/mp2t/timestamp_unroller_unittest.cc b/media/formats/mp2t/timestamp_unroller_unittest.cc
index 93c214d09d76b80538eeda4b441cd151ea0d1512..d99f5bd89883dcbb99f9251123049dc5fe4899f7 100644
--- a/media/formats/mp2t/timestamp_unroller_unittest.cc
+++ b/media/formats/mp2t/timestamp_unroller_unittest.cc
@@ -13,22 +13,22 @@
 namespace media {
 namespace mp2t {
 
-static std::vector<int64> TruncateTimestamps(
-    const std::vector<int64>& timestamps) {
+static std::vector<int64_t> TruncateTimestamps(
+    const std::vector<int64_t>& timestamps) {
   const int nbits = 33;
-  int64 truncate_mask = (INT64_C(1) << nbits) - 1;
-  std::vector<int64> truncated_timestamps(timestamps.size());
+  int64_t truncate_mask = (INT64_C(1) << nbits) - 1;
+  std::vector<int64_t> truncated_timestamps(timestamps.size());
   for (size_t k = 0; k < timestamps.size(); k++)
     truncated_timestamps[k] = timestamps[k] & truncate_mask;
   return truncated_timestamps;
 }
 
-static void RunUnrollTest(const std::vector<int64>& timestamps) {
-  std::vector<int64> truncated_timestamps = TruncateTimestamps(timestamps);
+static void RunUnrollTest(const std::vector<int64_t>& timestamps) {
+  std::vector<int64_t> truncated_timestamps = TruncateTimestamps(timestamps);
 
   TimestampUnroller timestamp_unroller;
   for (size_t k = 0; k < timestamps.size(); k++) {
-    int64 unrolled_timestamp =
+    int64_t unrolled_timestamp =
         timestamp_unroller.GetUnrolledTimestamp(truncated_timestamps[k]);
     EXPECT_EQ(timestamps[k], unrolled_timestamp);
   }
@@ -38,19 +38,19 @@ TEST(TimestampUnrollerTest, SingleStream) {
   // Array of 64 bit timestamps.
   // This is the expected result from unrolling these timestamps
   // truncated to 33 bits.
-  int64 timestamps[] = {
-    INT64_C(0x0000000000000000),
-    INT64_C(-190),                // - 190
-    INT64_C(0x00000000aaaaa9ed),  // + 0xaaaaaaab
-    INT64_C(0x0000000155555498),  // + 0xaaaaaaab
-    INT64_C(0x00000001ffffff43),  // + 0xaaaaaaab
-    INT64_C(0x00000002aaaaa9ee),  // + 0xaaaaaaab
-    INT64_C(0x0000000355555499),  // + 0xaaaaaaab
-    INT64_C(0x00000003ffffff44),  // + 0xaaaaaaab
+  int64_t timestamps[] = {
+      INT64_C(0x0000000000000000),
+      INT64_C(-190),                // - 190
+      INT64_C(0x00000000aaaaa9ed),  // + 0xaaaaaaab
+      INT64_C(0x0000000155555498),  // + 0xaaaaaaab
+      INT64_C(0x00000001ffffff43),  // + 0xaaaaaaab
+      INT64_C(0x00000002aaaaa9ee),  // + 0xaaaaaaab
+      INT64_C(0x0000000355555499),  // + 0xaaaaaaab
+      INT64_C(0x00000003ffffff44),  // + 0xaaaaaaab
   };
 
-  std::vector<int64> timestamps_vector(
-      timestamps, timestamps + arraysize(timestamps));
+  std::vector<int64_t> timestamps_vector(timestamps,
+                                         timestamps + arraysize(timestamps));
   RunUnrollTest(timestamps_vector);
 }