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..61761a84b9544c03e25dd9f1c9f48d8779cdfbde 100644
--- a/media/base/mock_demuxer_host.h
+++ b/media/base/mock_demuxer_host.h
@@ -5,9 +5,8 @@
 #ifndef MEDIA_BASE_MOCK_DEMUXER_HOST_H_
 #define MEDIA_BASE_MOCK_DEMUXER_HOST_H_
 
-#include <string>
-
 #include "media/base/demuxer.h"
+#include "media/base/text_track_config.h"

[acolwell GONE FROM CHROMIUM, 2013/10/29 21:14:19]

nit: remove. I don't think you need this include.

[Matthew Heaney (Chromium), 2013/11/05 04:52:40]

gtest-printers.h complains about not having the full definition.

 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace media {
@@ -26,6 +25,9 @@ class MockDemuxerHost : public DemuxerHost {
   // DemuxerHost implementation.
   MOCK_METHOD1(OnDemuxerError, void(PipelineStatus error));
   MOCK_METHOD1(SetDuration, void(base::TimeDelta duration));
+  MOCK_METHOD2(AddTextStream, void(DemuxerStream*,
+                                   const TextTrackConfig&));
+  MOCK_METHOD1(RemoveTextStream, void(DemuxerStream*));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockDemuxerHost);