Render inband text tracks in the media pipeline

content/renderer/media/android/media_source_delegate.cc

Index: content/renderer/media/android/media_source_delegate.cc
diff --git a/content/renderer/media/android/media_source_delegate.cc b/content/renderer/media/android/media_source_delegate.cc
index 7d7e917e4fbb0d0b7f78ae2626b464709eab8758..50c016d70b2ba4b9a4f8c9ac545e8c99a9594230 100644
--- a/content/renderer/media/android/media_source_delegate.cc
+++ b/content/renderer/media/android/media_source_delegate.cc
@@ -164,7 +164,6 @@ void MediaSourceDelegate::InitializeMediaSource(
           &MediaSourceDelegate::OnDemuxerOpened, main_weak_this_)),
       media::BindToCurrentLoop(base::Bind(
           &MediaSourceDelegate::OnNeedKey, main_weak_this_)),
-      base::Bind(&ReturnNullTextTrack),
       base::Bind(&LogMediaSourceError, media_log_)));
   demuxer_ = chunk_demuxer_.get();
 
@@ -179,7 +178,8 @@ void MediaSourceDelegate::InitializeDemuxer() {
   DCHECK(media_loop_->BelongsToCurrentThread());
   demuxer_client_->AddDelegate(demuxer_client_id_, this);
   demuxer_->Initialize(this, base::Bind(&MediaSourceDelegate::OnDemuxerInitDone,
-                                        media_weak_factory_.GetWeakPtr()));
+                                        media_weak_factory_.GetWeakPtr()),
+                       false);
 }
 
 #if defined(GOOGLE_TV)
@@ -506,6 +506,15 @@ void MediaSourceDelegate::OnDemuxerError(media::PipelineStatus status) {
     update_network_state_cb_.Run(PipelineErrorToNetworkState(status));
 }
 
+void MediaSourceDelegate::AddTextStream(DemuxerStream* /* text_stream */ ,
+                                        const TextTrackConfig& /* config */ ) {
+  // TODO(matthewjheaney): do something here

[acolwell GONE FROM CHROMIUM, 2013/11/21 02:49:18]

Put NOTIMPLEMENTED(); here and below. File a bug for adding inband text track
rendering support for Android and include the link here.

[Matthew Heaney (Chromium), 2013/11/21 19:23:33]

Done.

+}
+
+void MediaSourceDelegate::RemoveTextStream(DemuxerStream* /* text_stream */ ) {
+  // TODO(matthewjheaney): do something here
+}
+
 void MediaSourceDelegate::OnDemuxerInitDone(media::PipelineStatus status) {
   DCHECK(media_loop_->BelongsToCurrentThread());
   DVLOG(1) << __FUNCTION__ << "(" << status << ") : " << demuxer_client_id_;