| Index: media/filters/pipeline_integration_test.cc
|
| diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
|
| index 6f38923b0dd4ebd2b6672a6be9b0ce5daad14037..35d362ac6020d4392f3e0949f236c281831201d0 100644
|
| --- a/media/filters/pipeline_integration_test.cc
|
| +++ b/media/filters/pipeline_integration_test.cc
|
| @@ -221,8 +221,7 @@ class MockMediaSource {
|
| base::Unretained(this)),
|
| base::Bind(&MockMediaSource::DemuxerNeedKey,
|
| base::Unretained(this)),
|
| - base::Bind(&MockMediaSource::OnTextTrack,
|
| - base::Unretained(this)),
|
| + true, // enable inband text tracks
|
| LogCB())),
|
| owned_chunk_demuxer_(chunk_demuxer_) {
|
|
|
| @@ -324,12 +323,6 @@ class MockMediaSource {
|
| need_key_cb_.Run(type, init_data);
|
| }
|
|
|
| - scoped_ptr<TextTrack> OnTextTrack(TextKind kind,
|
| - const std::string& label,
|
| - const std::string& language) {
|
| - return scoped_ptr<TextTrack>();
|
| - }
|
| -
|
| private:
|
| base::FilePath file_path_;
|
| scoped_refptr<DecoderBuffer> file_data_;
|
| @@ -1088,7 +1081,8 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_VP8A_WebM) {
|
| }
|
|
|
| // Verify that VP8 video with inband text track can be played back.
|
| -TEST_F(PipelineIntegrationTest, BasicPlayback_VP8_WebVTT_WebM) {
|
| +TEST_F(PipelineIntegrationTest,
|
| + BasicPlayback_VP8_WebVTT_WebM) {
|
| ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8-webvtt.webm"),
|
| PIPELINE_OK));
|
| Play();
|
|
|