Render inband text tracks in the media pipeline

media/base/mock_demuxer_host.h

Index: media/base/mock_demuxer_host.h
diff --git a/media/base/mock_demuxer_host.h b/media/base/mock_demuxer_host.h
index 597c13298c5e9d5520696c6936bff9ca41bbced0..848285fa008feeed35b61d861cb3ddeacfeb9da6 100644
--- a/media/base/mock_demuxer_host.h
+++ b/media/base/mock_demuxer_host.h
@@ -5,6 +5,7 @@
 #ifndef MEDIA_BASE_MOCK_DEMUXER_HOST_H_
 #define MEDIA_BASE_MOCK_DEMUXER_HOST_H_
 
+#include <map>
 #include <string>
 
 #include "media/base/demuxer.h"
@@ -26,6 +27,14 @@ class MockDemuxerHost : public DemuxerHost {
   // DemuxerHost implementation.
   MOCK_METHOD1(OnDemuxerError, void(PipelineStatus error));
   MOCK_METHOD1(SetDuration, void(base::TimeDelta duration));
+  void AddTextStream(DemuxerStream* text_stream,
+                     TextKind kind,
+                     const std::string& label,
+                     const std::string& language);
+  void RemoveTextStream(DemuxerStream* text_stream);
+
+  typedef std::map<DemuxerStream*, TextTrackConfig> TextStreamMap;
+  TextStreamMap text_streams_;

[acolwell GONE FROM CHROMIUM, 2013/10/21 20:10:40]

nit: I don't think you need the map here. The mock isn't verifying anything. I
think these should just be MOCK_METHODs like the others and people can specify
the expected DemuxerStreams when writing tests if they actually care.

[Matthew Heaney (Chromium), 2013/10/23 05:09:01]

Done.

 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDemuxerHost);