Index: media/formats/webm/webm_tracks_parser_unittest.cc |
diff --git a/media/formats/webm/webm_tracks_parser_unittest.cc b/media/formats/webm/webm_tracks_parser_unittest.cc |
index 9c424ec3afc906f64f5b21ca7fbcf26b359f38ab..7e5a067a946aa202afcd5a95de167ad4ba611e9d 100644 |
--- a/media/formats/webm/webm_tracks_parser_unittest.cc |
+++ b/media/formats/webm/webm_tracks_parser_unittest.cc |
@@ -27,7 +27,7 @@ class WebMTracksParserTest : public testing::Test { |
WebMTracksParserTest() : media_log_(new StrictMock<MockMediaLog>()) {} |
protected: |
- void VerifyTextTrackInfo(const uint8* buffer, |
+ void VerifyTextTrackInfo(const uint8_t* buffer, |
int buffer_size, |
TextKind text_kind, |
const std::string& name, |
@@ -61,7 +61,7 @@ TEST_F(WebMTracksParserTest, SubtitleNoNameNoLang) { |
TracksBuilder tb; |
tb.AddTextTrack(1, 1, kWebMCodecSubtitles, "", ""); |
- const std::vector<uint8> buf = tb.Finish(); |
+ const std::vector<uint8_t> buf = tb.Finish(); |
VerifyTextTrackInfo(&buf[0], buf.size(), kTextSubtitles, "", ""); |
} |
@@ -71,7 +71,7 @@ TEST_F(WebMTracksParserTest, SubtitleYesNameNoLang) { |
TracksBuilder tb; |
tb.AddTextTrack(1, 1, kWebMCodecSubtitles, "Spock", ""); |
- const std::vector<uint8> buf = tb.Finish(); |
+ const std::vector<uint8_t> buf = tb.Finish(); |
VerifyTextTrackInfo(&buf[0], buf.size(), kTextSubtitles, "Spock", ""); |
} |
@@ -81,7 +81,7 @@ TEST_F(WebMTracksParserTest, SubtitleNoNameYesLang) { |
TracksBuilder tb; |
tb.AddTextTrack(1, 1, kWebMCodecSubtitles, "", "eng"); |
- const std::vector<uint8> buf = tb.Finish(); |
+ const std::vector<uint8_t> buf = tb.Finish(); |
VerifyTextTrackInfo(&buf[0], buf.size(), kTextSubtitles, "", "eng"); |
} |
@@ -91,7 +91,7 @@ TEST_F(WebMTracksParserTest, SubtitleYesNameYesLang) { |
TracksBuilder tb; |
tb.AddTextTrack(1, 1, kWebMCodecSubtitles, "Picard", "fre"); |
- const std::vector<uint8> buf = tb.Finish(); |
+ const std::vector<uint8_t> buf = tb.Finish(); |
VerifyTextTrackInfo(&buf[0], buf.size(), kTextSubtitles, "Picard", "fre"); |
} |
@@ -102,7 +102,7 @@ TEST_F(WebMTracksParserTest, IgnoringTextTracks) { |
tb.AddTextTrack(1, 1, kWebMCodecSubtitles, "Subtitles", "fre"); |
tb.AddTextTrack(2, 2, kWebMCodecSubtitles, "Commentary", "fre"); |
- const std::vector<uint8> buf = tb.Finish(); |
+ const std::vector<uint8_t> buf = tb.Finish(); |
scoped_ptr<WebMTracksParser> parser(new WebMTracksParser(media_log_, true)); |
EXPECT_MEDIA_LOG(HasSubstr("Ignoring text track 1")); |
@@ -114,7 +114,7 @@ TEST_F(WebMTracksParserTest, IgnoringTextTracks) { |
EXPECT_EQ(parser->text_tracks().size(), 0u); |
- const std::set<int64>& ignored_tracks = parser->ignored_tracks(); |
+ const std::set<int64_t>& ignored_tracks = parser->ignored_tracks(); |
EXPECT_TRUE(ignored_tracks.find(1) != ignored_tracks.end()); |
EXPECT_TRUE(ignored_tracks.find(2) != ignored_tracks.end()); |
@@ -137,7 +137,7 @@ TEST_F(WebMTracksParserTest, AudioVideoDefaultDurationUnset) { |
TracksBuilder tb; |
tb.AddAudioTrack(1, 1, "A_VORBIS", "audio", "", -1, 2, 8000); |
tb.AddVideoTrack(2, 2, "V_VP8", "video", "", -1, 320, 240); |
- const std::vector<uint8> buf = tb.Finish(); |
+ const std::vector<uint8_t> buf = tb.Finish(); |
scoped_ptr<WebMTracksParser> parser(new WebMTracksParser(media_log_, true)); |
int result = parser->Parse(&buf[0], buf.size()); |
@@ -166,7 +166,7 @@ TEST_F(WebMTracksParserTest, AudioVideoDefaultDurationSet) { |
TracksBuilder tb; |
tb.AddAudioTrack(1, 1, "A_VORBIS", "audio", "", 12345678, 2, 8000); |
tb.AddVideoTrack(2, 2, "V_VP8", "video", "", 987654321, 320, 240); |
- const std::vector<uint8> buf = tb.Finish(); |
+ const std::vector<uint8_t> buf = tb.Finish(); |
scoped_ptr<WebMTracksParser> parser(new WebMTracksParser(media_log_, true)); |
int result = parser->Parse(&buf[0], buf.size()); |
@@ -188,7 +188,7 @@ TEST_F(WebMTracksParserTest, InvalidZeroDefaultDurationSet) { |
// Confirm parse error if TrackEntry DefaultDuration is present, but is 0ns. |
TracksBuilder tb(true); |
tb.AddAudioTrack(1, 1, "A_VORBIS", "audio", "", 0, 2, 8000); |
- const std::vector<uint8> buf = tb.Finish(); |
+ const std::vector<uint8_t> buf = tb.Finish(); |
scoped_ptr<WebMTracksParser> parser(new WebMTracksParser(media_log_, true)); |
@@ -202,7 +202,7 @@ TEST_F(WebMTracksParserTest, HighTrackUID) { |
// (http://crbug.com/397067). |
TracksBuilder tb(true); |
tb.AddAudioTrack(1, 1ULL << 31, "A_VORBIS", "audio", "", 40, 2, 8000); |
- const std::vector<uint8> buf = tb.Finish(); |
+ const std::vector<uint8_t> buf = tb.Finish(); |
scoped_ptr<WebMTracksParser> parser(new WebMTracksParser(media_log_, true)); |
EXPECT_GT(parser->Parse(&buf[0], buf.size()),0); |