Render inband text tracks in the media pipeline

media/mp3/mp3_stream_parser.cc

Index: media/mp3/mp3_stream_parser.cc
diff --git a/media/mp3/mp3_stream_parser.cc b/media/mp3/mp3_stream_parser.cc
index 5d2f8c1d7594ffd861ce46adceac9476c3d72ce6..00b7a23d80885257da8e2100c292520efe837c73 100644
--- a/media/mp3/mp3_stream_parser.cc
+++ b/media/mp3/mp3_stream_parser.cc
@@ -10,6 +10,7 @@
 #include "media/base/bit_reader.h"
 #include "media/base/buffers.h"
 #include "media/base/stream_parser_buffer.h"
+#include "media/base/text_track_config.h"
 #include "media/base/video_decoder_config.h"
 #include "net/http/http_util.h"
 
@@ -117,9 +118,8 @@ MP3StreamParser::~MP3StreamParser() {}
 void MP3StreamParser::Init(const InitCB& init_cb,
                            const NewConfigCB& config_cb,
                            const NewBuffersCB& new_buffers_cb,
-                           const NewTextBuffersCB& text_cb,
+                           const NewTextBuffersCB& /* text_cb */ ,

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

nit: Why does the name need to be in a comment now? It didn't before.

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

Done.

                            const NeedKeyCB& need_key_cb,
-                           const AddTextTrackCB& add_text_track_cb,
                            const NewMediaSegmentCB& new_segment_cb,
                            const base::Closure& end_of_segment_cb,
                            const LogCB& log_cb) {
@@ -410,7 +410,7 @@ int MP3StreamParser::ParseMP3Frame(const uint8* data,
     timestamp_helper_->SetBaseTimestamp(base_timestamp);
 
     VideoDecoderConfig video_config;
-    bool success = config_cb_.Run(config_, video_config);
+    bool success = config_cb_.Run(config_, video_config, TextTrackConfigMap());
 
     if (!init_cb_.is_null())
       base::ResetAndReturn(&init_cb_).Run(success, kInfiniteDuration());