diff options
Diffstat (limited to 'chromium/media/webm/webm_cluster_parser_unittest.cc')
| -rw-r--r-- | chromium/media/webm/webm_cluster_parser_unittest.cc | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/chromium/media/webm/webm_cluster_parser_unittest.cc b/chromium/media/webm/webm_cluster_parser_unittest.cc index 5c5837fa866..691325d7403 100644 --- a/chromium/media/webm/webm_cluster_parser_unittest.cc +++ b/chromium/media/webm/webm_cluster_parser_unittest.cc @@ -374,11 +374,10 @@ TEST_F(WebMClusterParserTest, IgnoredTracks) { TEST_F(WebMClusterParserTest, ParseTextTracks) { typedef WebMTracksParser::TextTracks TextTracks; TextTracks text_tracks; - WebMTracksParser::TextTrackInfo text_track_info; - text_track_info.kind = kTextSubtitles; text_tracks.insert(std::make_pair(TextTracks::key_type(kTextTrackNum), - text_track_info)); + TextTrackConfig(kTextSubtitles, "", "", + ""))); parser_.reset(new WebMClusterParser(kTimecodeScale, kAudioTrackNum, @@ -410,12 +409,11 @@ TEST_F(WebMClusterParserTest, ParseTextTracks) { TEST_F(WebMClusterParserTest, TextTracksSimpleBlock) { typedef WebMTracksParser::TextTracks TextTracks; - TextTracks text_tracks; - WebMTracksParser::TextTrackInfo text_track_info; + WebMTracksParser::TextTracks text_tracks; - text_track_info.kind = kTextSubtitles; text_tracks.insert(std::make_pair(TextTracks::key_type(kTextTrackNum), - text_track_info)); + TextTrackConfig(kTextSubtitles, "", "", + ""))); parser_.reset(new WebMClusterParser(kTimecodeScale, kAudioTrackNum, @@ -441,18 +439,17 @@ TEST_F(WebMClusterParserTest, TextTracksSimpleBlock) { TEST_F(WebMClusterParserTest, ParseMultipleTextTracks) { typedef WebMTracksParser::TextTracks TextTracks; TextTracks text_tracks; - WebMTracksParser::TextTrackInfo text_track_info; const int kSubtitleTextTrackNum = kTextTrackNum; const int kCaptionTextTrackNum = kTextTrackNum + 1; - text_track_info.kind = kTextSubtitles; text_tracks.insert(std::make_pair(TextTracks::key_type(kSubtitleTextTrackNum), - text_track_info)); + TextTrackConfig(kTextSubtitles, "", "", + ""))); - text_track_info.kind = kTextCaptions; text_tracks.insert(std::make_pair(TextTracks::key_type(kCaptionTextTrackNum), - text_track_info)); + TextTrackConfig(kTextCaptions, "", "", + ""))); parser_.reset(new WebMClusterParser(kTimecodeScale, kAudioTrackNum, |