Render inband text tracks in the media pipeline

media/filters/pipeline_integration_test_base.h

Index: media/filters/pipeline_integration_test_base.h
diff --git a/media/filters/pipeline_integration_test_base.h b/media/filters/pipeline_integration_test_base.h
index ade9ad6d97482b798c35d07bff9099f2a0144f9e..d175f5ce0d1dafb463fb55b018bfc8ae832d7317 100644
--- a/media/filters/pipeline_integration_test_base.h
+++ b/media/filters/pipeline_integration_test_base.h
@@ -5,6 +5,8 @@
 #ifndef MEDIA_FILTERS_PIPELINE_INTEGRATION_TEST_BASE_H_
 #define MEDIA_FILTERS_PIPELINE_INTEGRATION_TEST_BASE_H_
 
+#include <map>
+
 #include "base/md5.h"
 #include "base/message_loop/message_loop.h"
 #include "media/audio/clockless_audio_sink.h"
@@ -12,6 +14,7 @@
 #include "media/base/filter_collection.h"
 #include "media/base/media_keys.h"
 #include "media/base/pipeline.h"
+#include "media/base/text_track.h"
 #include "media/base/video_frame.h"
 #include "media/filters/video_renderer_base.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -24,6 +27,7 @@ namespace media {
 
 class Decryptor;
 class Demuxer;
+class TextCue;

[acolwell GONE FROM CHROMIUM, 2013/10/08 15:45:24]

nit: not needed.

[Matthew Heaney (Chromium), 2013/10/13 05:30:17]

Done.

 
 // Empty MD5 hash string.  Used to verify empty video tracks.
 extern const char kNullVideoHash[];
@@ -98,6 +102,9 @@ class PipelineIntegrationTestBase {
   NeedKeyCB need_key_cb_;
   VideoFrame::Format last_video_frame_format_;
 
+  typedef std::map<media::DemuxerStream*, media::TextTrack*> TextTracks;
+  TextTracks text_tracks_;

[acolwell GONE FROM CHROMIUM, 2013/10/08 15:45:24]

nit: Not used anywhere.

[Matthew Heaney (Chromium), 2013/10/13 05:30:17]

Done.

+
   void OnStatusCallbackChecked(PipelineStatus expected_status,
                                PipelineStatus status);
   void OnStatusCallback(PipelineStatus status);