Render inband text tracks in the media pipeline

media/mp3/mp3_stream_parser_unittest.cc

Index: media/mp3/mp3_stream_parser_unittest.cc
diff --git a/media/mp3/mp3_stream_parser_unittest.cc b/media/mp3/mp3_stream_parser_unittest.cc
index 2e2b12e1246435071e72c6bf8b872a823cefa2d7..533a471de309b2681e7dd6eb9b56d8c389876cf2 100644
--- a/media/mp3/mp3_stream_parser_unittest.cc
+++ b/media/mp3/mp3_stream_parser_unittest.cc
@@ -7,6 +7,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/mp3/mp3_stream_parser.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -44,7 +45,8 @@ class MP3StreamParserTest : public testing::Test {
   }
 
   bool OnNewConfig(const AudioDecoderConfig& audio_config,
-                   const VideoDecoderConfig& video_config) {
+                   const VideoDecoderConfig& video_config,
+                   const TextTrackConfigMap& text_config) {
     DVLOG(1) << __FUNCTION__ << "(" << audio_config.IsValidConfig() << ", "
              << video_config.IsValidConfig() << ")";
     EXPECT_TRUE(audio_config.IsValidConfig());
@@ -79,7 +81,7 @@ class MP3StreamParserTest : 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 since you are removing the reference below.

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

Done.

                         const StreamParser::BufferQueue& buffers) {
     return true;
   }
@@ -89,12 +91,6 @@ class MP3StreamParserTest : public testing::Test {
     DVLOG(1) << __FUNCTION__ << "(" << type << ", " << 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) << __FUNCTION__;
     results_stream_ << "NewSegment";
@@ -110,11 +106,8 @@ class MP3StreamParserTest : public testing::Test {
         base::Bind(&MP3StreamParserTest::OnInitDone, base::Unretained(this)),
         base::Bind(&MP3StreamParserTest::OnNewConfig, base::Unretained(this)),
         base::Bind(&MP3StreamParserTest::OnNewBuffers, base::Unretained(this)),
-        base::Bind(&MP3StreamParserTest::OnNewTextBuffers,
-                   base::Unretained(this)),
+        StreamParser::NewTextBuffersCB(),
         base::Bind(&MP3StreamParserTest::OnKeyNeeded, base::Unretained(this)),
-        base::Bind(&MP3StreamParserTest::OnAddTextTrack,
-                   base::Unretained(this)),
         base::Bind(&MP3StreamParserTest::OnNewSegment, base::Unretained(this)),
         base::Bind(&MP3StreamParserTest::OnEndOfSegment,
                    base::Unretained(this)),