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 b81aa2173f0bfe79e1827f0cc797b2bdf4186f8e..86566da1010e74bb2d359dce169a3a3dcdbf85ab 100644 |
--- a/media/formats/webm/webm_tracks_parser_unittest.cc |
+++ b/media/formats/webm/webm_tracks_parser_unittest.cc |
@@ -28,7 +28,8 @@ static void VerifyTextTrackInfo(const uint8* buffer, |
TextKind text_kind, |
const std::string& name, |
const std::string& language) { |
- scoped_ptr<WebMTracksParser> parser(new WebMTracksParser(LogCB(), false)); |
+ scoped_ptr<WebMTracksParser> parser( |
+ new WebMTracksParser(LogCB(), false, false)); |
int result = parser->Parse(buffer, buffer_size); |
EXPECT_GT(result, 0); |
@@ -94,7 +95,8 @@ TEST_F(WebMTracksParserTest, IgnoringTextTracks) { |
tb.AddTextTrack(2, 2, kWebMCodecSubtitles, "Commentary", "fre"); |
const std::vector<uint8> buf = tb.Finish(); |
- scoped_ptr<WebMTracksParser> parser(new WebMTracksParser(LogCB(), true)); |
+ scoped_ptr<WebMTracksParser> parser( |
+ new WebMTracksParser(LogCB(), true, false)); |
int result = parser->Parse(&buf[0], buf.size()); |
EXPECT_GT(result, 0); |
@@ -107,7 +109,7 @@ TEST_F(WebMTracksParserTest, IgnoringTextTracks) { |
EXPECT_TRUE(ignored_tracks.find(2) != ignored_tracks.end()); |
// Test again w/o ignoring the test tracks. |
- parser.reset(new WebMTracksParser(LogCB(), false)); |
+ parser.reset(new WebMTracksParser(LogCB(), false, false)); |
result = parser->Parse(&buf[0], buf.size()); |
EXPECT_GT(result, 0); |
@@ -127,7 +129,7 @@ TEST_F(WebMTracksParserTest, AudioVideoDefaultDurationUnset) { |
tb.AddVideoTrack(2, 2, "V_VP8", "video", "", -1, 320, 240); |
const std::vector<uint8> buf = tb.Finish(); |
- scoped_ptr<WebMTracksParser> parser(new WebMTracksParser(LogCB(), true)); |
+ scoped_ptr<WebMTracksParser> parser(new WebMTracksParser(LogCB(), true, false)); |
scherkus (not reviewing)
2014/04/10 21:11:49
80 chars
Sergey Ulanov
2014/04/10 23:10:07
Done.
|
int result = parser->Parse(&buf[0], buf.size()); |
EXPECT_LE(0, result); |
EXPECT_EQ(static_cast<int>(buf.size()), result); |
@@ -156,7 +158,8 @@ TEST_F(WebMTracksParserTest, AudioVideoDefaultDurationSet) { |
tb.AddVideoTrack(2, 2, "V_VP8", "video", "", 987654321, 320, 240); |
const std::vector<uint8> buf = tb.Finish(); |
- scoped_ptr<WebMTracksParser> parser(new WebMTracksParser(LogCB(), true)); |
+ scoped_ptr<WebMTracksParser> parser( |
+ new WebMTracksParser(LogCB(), true, false)); |
int result = parser->Parse(&buf[0], buf.size()); |
EXPECT_LE(0, result); |
EXPECT_EQ(static_cast<int>(buf.size()), result); |
@@ -178,7 +181,8 @@ TEST_F(WebMTracksParserTest, InvalidZeroDefaultDurationSet) { |
tb.AddAudioTrack(1, 1, "A_VORBIS", "audio", "", 0, 2, 8000); |
const std::vector<uint8> buf = tb.Finish(); |
- scoped_ptr<WebMTracksParser> parser(new WebMTracksParser(LogCB(), true)); |
+ scoped_ptr<WebMTracksParser> parser( |
+ new WebMTracksParser(LogCB(), true, false)); |
EXPECT_EQ(-1, parser->Parse(&buf[0], buf.size())); |
} |