| Index: media/formats/webm/webm_cluster_parser_unittest.cc
|
| diff --git a/media/formats/webm/webm_cluster_parser_unittest.cc b/media/formats/webm/webm_cluster_parser_unittest.cc
|
| index 7581bbf86659f8022f93aa78d85d0714685cf784..1605dfe41b6c673d20310e6644a63b56c9ff64c8 100644
|
| --- a/media/formats/webm/webm_cluster_parser_unittest.cc
|
| +++ b/media/formats/webm/webm_cluster_parser_unittest.cc
|
| @@ -319,7 +319,7 @@ class WebMClusterParserTest : public testing::Test {
|
| base::TimeDelta audio_default_duration,
|
| base::TimeDelta video_default_duration,
|
| const WebMTracksParser::TextTracks& text_tracks,
|
| - const std::set<int64>& ignored_tracks,
|
| + const std::set<int64_t>& ignored_tracks,
|
| const std::string& audio_encryption_key_id,
|
| const std::string& video_encryption_key_id,
|
| const AudioCodec audio_codec) {
|
| @@ -333,7 +333,7 @@ class WebMClusterParserTest : public testing::Test {
|
| // Create a default version of the parser for test.
|
| WebMClusterParser* CreateDefaultParser() {
|
| return CreateParserHelper(kNoTimestamp(), kNoTimestamp(), TextTracks(),
|
| - std::set<int64>(), std::string(), std::string(),
|
| + std::set<int64_t>(), std::string(), std::string(),
|
| kUnknownAudioCodec);
|
| }
|
|
|
| @@ -344,13 +344,13 @@ class WebMClusterParserTest : public testing::Test {
|
| base::TimeDelta video_default_duration,
|
| const WebMTracksParser::TextTracks& text_tracks = TextTracks()) {
|
| return CreateParserHelper(audio_default_duration, video_default_duration,
|
| - text_tracks, std::set<int64>(), std::string(),
|
| + text_tracks, std::set<int64_t>(), std::string(),
|
| std::string(), kUnknownAudioCodec);
|
| }
|
|
|
| // Create a parser for test with custom ignored tracks.
|
| WebMClusterParser* CreateParserWithIgnoredTracks(
|
| - std::set<int64>& ignored_tracks) {
|
| + std::set<int64_t>& ignored_tracks) {
|
| return CreateParserHelper(kNoTimestamp(), kNoTimestamp(), TextTracks(),
|
| ignored_tracks, std::string(), std::string(),
|
| kUnknownAudioCodec);
|
| @@ -362,7 +362,7 @@ class WebMClusterParserTest : public testing::Test {
|
| const std::string& video_encryption_key_id,
|
| const AudioCodec audio_codec) {
|
| return CreateParserHelper(kNoTimestamp(), kNoTimestamp(), TextTracks(),
|
| - std::set<int64>(), audio_encryption_key_id,
|
| + std::set<int64_t>(), audio_encryption_key_id,
|
| video_encryption_key_id, audio_codec);
|
| }
|
|
|
| @@ -579,7 +579,7 @@ TEST_F(WebMClusterParserTest, ParseSimpleBlockAndBlockGroupMixture) {
|
| }
|
|
|
| TEST_F(WebMClusterParserTest, IgnoredTracks) {
|
| - std::set<int64> ignored_tracks;
|
| + std::set<int64_t> ignored_tracks;
|
| ignored_tracks.insert(kTextTrackNum);
|
|
|
| parser_.reset(CreateParserWithIgnoredTracks(ignored_tracks));
|
|
|