Media Source dispatches inband text tracks

media/filters/pipeline_integration_test.cc

Index: media/filters/pipeline_integration_test.cc
diff --git a/media/filters/pipeline_integration_test.cc b/media/filters/pipeline_integration_test.cc
index 3b456a1b752ce8dbb70d0189ccf42e8ba6aa178a..60c89f4e3d48fbccc303037255876cbb25b4e086 100644
--- a/media/filters/pipeline_integration_test.cc
+++ b/media/filters/pipeline_integration_test.cc
@@ -237,6 +237,8 @@ class MockMediaSource {
                        base::Unretained(this)),
             base::Bind(&MockMediaSource::DemuxerNeedKey,
                        base::Unretained(this)),
+            base::Bind(&MockMediaSource::OnTextTrack,
+                       base::Unretained(this)),
             LogCB())),
         owned_chunk_demuxer_(chunk_demuxer_) {
 
@@ -324,6 +326,13 @@ class MockMediaSource {
         std::string(), std::string(), type, init_data.Pass(), init_data_size);
   }
 
+  scoped_ptr<TextTrack> OnTextTrack(TextKind kind,
+                                    const std::string& label,
+                                    const std::string& language) {
+    // TODO(matthewjheaney): put something here
+    return scoped_ptr<TextTrack>(0);

[acolwell GONE FROM CHROMIUM, 2013/05/15 22:42:36]

What are your plans here? At a minimum the caller needs to protect itself from
NULL being returned here. Perhaps have it avoid creating a map entry for this
track?

[Matthew Heaney (Chromium), 2013/05/16 22:05:22]

Done.

+  }
+
  private:
   base::FilePath file_path_;
   scoped_refptr<DecoderBuffer> file_data_;
@@ -931,4 +940,12 @@ TEST_F(PipelineIntegrationTest, BasicPlayback_VP8A_WebM) {
   EXPECT_EQ(last_video_frame_format_, VideoFrame::YV12A);
 }
 
+// Verify that VP8 video with inband text track can be played back.
+TEST_F(PipelineIntegrationTest, BasicPlayback_VP8_WebVTT_WebM) {
+  ASSERT_TRUE(Start(GetTestDataFilePath("bear-vp8-webvtt.webm"),
+                    PIPELINE_OK));
+  Play();
+  ASSERT_TRUE(WaitUntilOnEnded());
+}
+
 }  // namespace media