Render inband text tracks in the media pipeline

media/mp2t/mp2t_stream_parser_unittest.cc

Index: media/mp2t/mp2t_stream_parser_unittest.cc
diff --git a/media/mp2t/mp2t_stream_parser_unittest.cc b/media/mp2t/mp2t_stream_parser_unittest.cc
index 12a3b9519da85870c0838993cfafea200e5e0a14..f0e6827cb45ec2167a1431b244ec878a6eed1996 100644
--- a/media/mp2t/mp2t_stream_parser_unittest.cc
+++ b/media/mp2t/mp2t_stream_parser_unittest.cc
@@ -14,6 +14,7 @@
 #include "media/base/decoder_buffer.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/test_data_util.h"
+#include "media/base/text_track_config.h"
 #include "media/base/video_decoder_config.h"
 #include "media/mp2t/mp2t_stream_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -60,7 +61,9 @@ class Mp2tStreamParserTest : public testing::Test {
              << ", dur=" << duration.InMilliseconds();
   }
 
-  bool OnNewConfig(const AudioDecoderConfig& ac, const VideoDecoderConfig& vc) {
+  bool OnNewConfig(const AudioDecoderConfig& ac,
+                   const VideoDecoderConfig& vc,
+                   const TextTrackConfigMap& tc) {
     DVLOG(1) << "OnNewConfig: audio=" << ac.IsValidConfig()
              << ", video=" << vc.IsValidConfig();
     return true;
@@ -101,7 +104,7 @@ class Mp2tStreamParserTest : public testing::Test {
     return true;
   }
 
-  bool OnNewTextBuffers(TextTrack* text_track,
+  bool OnNewTextBuffers(int text_track,

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

nit: Remove this since you are removing the reference below.

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

Done.

                         const StreamParser::BufferQueue& buffers) {
     return true;
   }
@@ -111,13 +114,6 @@ class Mp2tStreamParserTest : public testing::Test {
     DVLOG(1) << "OnKeyNeeded: " << init_data.size();
   }
 
-  scoped_ptr<TextTrack> OnAddTextTrack(
-      TextKind kind,
-      const std::string& label,
-      const std::string& language) {
-    return scoped_ptr<TextTrack>();
-  }
-
   void OnNewSegment() {
     DVLOG(1) << "OnNewSegment";
   }
@@ -134,12 +130,9 @@ class Mp2tStreamParserTest : public testing::Test {
                    base::Unretained(this)),
         base::Bind(&Mp2tStreamParserTest::OnNewBuffers,
                    base::Unretained(this)),
-        base::Bind(&Mp2tStreamParserTest::OnNewTextBuffers,
-                   base::Unretained(this)),
+        StreamParser::NewTextBuffersCB(),
         base::Bind(&Mp2tStreamParserTest::OnKeyNeeded,
                    base::Unretained(this)),
-        base::Bind(&Mp2tStreamParserTest::OnAddTextTrack,
-                   base::Unretained(this)),
         base::Bind(&Mp2tStreamParserTest::OnNewSegment,
                    base::Unretained(this)),
         base::Bind(&Mp2tStreamParserTest::OnEndOfSegment,