Index: media/mp2t/mp2t_stream_parser_unittest.cc |
diff --git a/media/mp2t/mp2t_stream_parser_unittest.cc b/media/mp2t/mp2t_stream_parser_unittest.cc |
index 12a3b9519da85870c0838993cfafea200e5e0a14..44e5d28b71b8b1cbb853294e18d803ea9b6418d9 100644 |
--- a/media/mp2t/mp2t_stream_parser_unittest.cc |
+++ b/media/mp2t/mp2t_stream_parser_unittest.cc |
@@ -60,7 +60,9 @@ class Mp2tStreamParserTest : public testing::Test { |
<< ", dur=" << duration.InMilliseconds(); |
} |
- bool OnNewConfig(const AudioDecoderConfig& ac, const VideoDecoderConfig& vc) { |
+ bool OnNewConfig(const AudioDecoderConfig& ac, |
+ const VideoDecoderConfig& vc, |
+ const TextTrackConfigMap& tc) { |
DVLOG(1) << "OnNewConfig: audio=" << ac.IsValidConfig() |
<< ", video=" << vc.IsValidConfig(); |
return true; |
@@ -101,7 +103,7 @@ class Mp2tStreamParserTest : public testing::Test { |
return true; |
} |
- bool OnNewTextBuffers(TextTrack* text_track, |
+ bool OnNewTextBuffers(int text_track, |
const StreamParser::BufferQueue& buffers) { |
return true; |
} |
@@ -111,13 +113,6 @@ class Mp2tStreamParserTest : public testing::Test { |
DVLOG(1) << "OnKeyNeeded: " << init_data.size(); |
} |
- scoped_ptr<TextTrack> OnAddTextTrack( |
- TextKind kind, |
- const std::string& label, |
- const std::string& language) { |
- return scoped_ptr<TextTrack>(); |
- } |
- |
void OnNewSegment() { |
DVLOG(1) << "OnNewSegment"; |
} |
@@ -138,8 +133,7 @@ class Mp2tStreamParserTest : public testing::Test { |
base::Unretained(this)), |
base::Bind(&Mp2tStreamParserTest::OnKeyNeeded, |
base::Unretained(this)), |
- base::Bind(&Mp2tStreamParserTest::OnAddTextTrack, |
- base::Unretained(this)), |
+ true, |
base::Bind(&Mp2tStreamParserTest::OnNewSegment, |
base::Unretained(this)), |
base::Bind(&Mp2tStreamParserTest::OnEndOfSegment, |