Switch to standard integer types in media/.

media/formats/mp4/aac_unittest.cc

Index: media/formats/mp4/aac_unittest.cc
diff --git a/media/formats/mp4/aac_unittest.cc b/media/formats/mp4/aac_unittest.cc
index 8a079bca6d8fd7201812b7aa7939286c9af82ce2..5b6e6b4a33d431ef120e9497558f21d761d5b745 100644
--- a/media/formats/mp4/aac_unittest.cc
+++ b/media/formats/mp4/aac_unittest.cc
@@ -68,7 +68,7 @@ class AACTest : public testing::Test {
  public:
   AACTest() : media_log_(new StrictMock<MockMediaLog>()) {}
 
-  bool Parse(const std::vector<uint8>& data) {
+  bool Parse(const std::vector<uint8_t>& data) {
     return aac_.Parse(data, media_log_);
   }
 
@@ -77,8 +77,8 @@ class AACTest : public testing::Test {
 };
 
 TEST_F(AACTest, BasicProfileTest) {
-  uint8 buffer[] = {0x12, 0x10};
-  std::vector<uint8> data;
+  uint8_t buffer[] = {0x12, 0x10};
+  std::vector<uint8_t> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
 
@@ -92,8 +92,8 @@ TEST_F(AACTest, BasicProfileTest) {
 }
 
 TEST_F(AACTest, ExtensionTest) {
-  uint8 buffer[] = {0x13, 0x08, 0x56, 0xe5, 0x9d, 0x48, 0x80};
-  std::vector<uint8> data;
+  uint8_t buffer[] = {0x13, 0x08, 0x56, 0xe5, 0x9d, 0x48, 0x80};
+  std::vector<uint8_t> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
 
@@ -112,8 +112,8 @@ TEST_F(AACTest, ExtensionTest) {
 // specified. Otherwise stereo should be reported.
 // See ISO 14496-3:2005 Section 1.6.5.3 for details about this special casing.
 TEST_F(AACTest, ImplicitSBR_ChannelConfig0) {
-  uint8 buffer[] = {0x13, 0x08};
-  std::vector<uint8> data;
+  uint8_t buffer[] = {0x13, 0x08};
+  std::vector<uint8_t> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
 
@@ -134,8 +134,8 @@ TEST_F(AACTest, ImplicitSBR_ChannelConfig0) {
 
 // Tests implicit SBR with a stereo channel config.
 TEST_F(AACTest, ImplicitSBR_ChannelConfig1) {
-  uint8 buffer[] = {0x13, 0x10};
-  std::vector<uint8> data;
+  uint8_t buffer[] = {0x13, 0x10};
+  std::vector<uint8_t> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
 
@@ -155,8 +155,8 @@ TEST_F(AACTest, ImplicitSBR_ChannelConfig1) {
 }
 
 TEST_F(AACTest, SixChannelTest) {
-  uint8 buffer[] = {0x11, 0xb0};
-  std::vector<uint8> data;
+  uint8_t buffer[] = {0x11, 0xb0};
+  std::vector<uint8_t> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
 
@@ -170,7 +170,7 @@ TEST_F(AACTest, SixChannelTest) {
 }
 
 TEST_F(AACTest, DataTooShortTest) {
-  std::vector<uint8> data;
+  std::vector<uint8_t> data;
 
   EXPECT_FALSE(Parse(data));
 
@@ -180,8 +180,8 @@ TEST_F(AACTest, DataTooShortTest) {
 
 TEST_F(AACTest, IncorrectProfileTest) {
   InSequence s;
-  uint8 buffer[] = {0x0, 0x08};
-  std::vector<uint8> data;
+  uint8_t buffer[] = {0x0, 0x08};
+  std::vector<uint8_t> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
   EXPECT_FALSE(Parse(data));
@@ -200,8 +200,8 @@ TEST_F(AACTest, IncorrectProfileTest) {
 }
 
 TEST_F(AACTest, IncorrectFrequencyTest) {
-  uint8 buffer[] = {0x0f, 0x88};
-  std::vector<uint8> data;
+  uint8_t buffer[] = {0x0f, 0x88};
+  std::vector<uint8_t> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
   EXPECT_FALSE(Parse(data));
@@ -216,8 +216,8 @@ TEST_F(AACTest, IncorrectFrequencyTest) {
 }
 
 TEST_F(AACTest, IncorrectChannelTest) {
-  uint8 buffer[] = {0x0e, 0x00};
-  std::vector<uint8> data;
+  uint8_t buffer[] = {0x0e, 0x00};
+  std::vector<uint8_t> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
   EXPECT_FALSE(Parse(data));
@@ -232,8 +232,8 @@ TEST_F(AACTest, IncorrectChannelTest) {
 
 TEST_F(AACTest, UnsupportedProfileTest) {
   InSequence s;
-  uint8 buffer[] = {0x3a, 0x08};
-  std::vector<uint8> data;
+  uint8_t buffer[] = {0x3a, 0x08};
+  std::vector<uint8_t> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
   EXPECT_MEDIA_LOG(UnsupportedAudioProfileLog("mp4a.40.7"));
@@ -250,8 +250,8 @@ TEST_F(AACTest, UnsupportedProfileTest) {
 
 TEST_F(AACTest, UnsupportedChannelLayoutTest) {
   InSequence s;
-  uint8 buffer[] = {0x12, 0x78};
-  std::vector<uint8> data;
+  uint8_t buffer[] = {0x12, 0x78};
+  std::vector<uint8_t> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
   EXPECT_MEDIA_LOG(UnsupportedChannelConfigLog("15"));
@@ -267,8 +267,8 @@ TEST_F(AACTest, UnsupportedChannelLayoutTest) {
 
 TEST_F(AACTest, UnsupportedFrequencyIndexTest) {
   InSequence s;
-  uint8 buffer[] = {0x17, 0x10};
-  std::vector<uint8> data;
+  uint8_t buffer[] = {0x17, 0x10};
+  std::vector<uint8_t> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
   EXPECT_MEDIA_LOG(UnsupportedFrequencyIndexLog("e"));
@@ -284,8 +284,8 @@ TEST_F(AACTest, UnsupportedFrequencyIndexTest) {
 
 TEST_F(AACTest, UnsupportedExFrequencyIndexTest) {
   InSequence s;
-  uint8 buffer[] = {0x29, 0x17, 0x08, 0x0};
-  std::vector<uint8> data;
+  uint8_t buffer[] = {0x29, 0x17, 0x08, 0x0};
+  std::vector<uint8_t> data;
 
   data.assign(buffer, buffer + sizeof(buffer));
   EXPECT_MEDIA_LOG(UnsupportedExtensionFrequencyIndexLog("e"));