Index: media/mp4/mp4_stream_parser_unittest.cc |
diff --git a/media/mp4/mp4_stream_parser_unittest.cc b/media/mp4/mp4_stream_parser_unittest.cc |
index 816a2106e397646d9e817a2460daedba0b5d1304..c106091744aaaef9f599e004000e6f7e278d7dab 100644 |
--- a/media/mp4/mp4_stream_parser_unittest.cc |
+++ b/media/mp4/mp4_stream_parser_unittest.cc |
@@ -62,7 +62,9 @@ class MP4StreamParserTest : public testing::Test { |
<< ", dur=" << duration.InMilliseconds(); |
} |
- bool NewConfigF(const AudioDecoderConfig& ac, const VideoDecoderConfig& vc) { |
+ bool NewConfigF(const AudioDecoderConfig& ac, |
+ const VideoDecoderConfig& vc, |
+ const TextTrackConfigMap& tc) { |
DVLOG(1) << "NewConfigF: audio=" << ac.IsValidConfig() |
<< ", video=" << vc.IsValidConfig(); |
configs_received_ = true; |
@@ -88,7 +90,7 @@ class MP4StreamParserTest : public testing::Test { |
return true; |
} |
- bool NewTextBuffersF(TextTrack* text_track, |
+ bool NewTextBuffersF(int text_track, |
const StreamParser::BufferQueue& buffers) { |
return true; |
} |
@@ -100,13 +102,6 @@ class MP4StreamParserTest : public testing::Test { |
EXPECT_FALSE(init_data.empty()); |
} |
- scoped_ptr<TextTrack> AddTextTrackF( |
- TextKind kind, |
- const std::string& label, |
- const std::string& language) { |
- return scoped_ptr<TextTrack>(); |
- } |
- |
void NewSegmentF() { |
DVLOG(1) << "NewSegmentF"; |
} |
@@ -123,7 +118,7 @@ class MP4StreamParserTest : public testing::Test { |
base::Bind(&MP4StreamParserTest::NewTextBuffersF, |
base::Unretained(this)), |
base::Bind(&MP4StreamParserTest::KeyNeededF, base::Unretained(this)), |
- base::Bind(&MP4StreamParserTest::AddTextTrackF, base::Unretained(this)), |
+ true, |
base::Bind(&MP4StreamParserTest::NewSegmentF, base::Unretained(this)), |
base::Bind(&MP4StreamParserTest::EndOfSegmentF, |
base::Unretained(this)), |