Render inband text tracks in the media pipeline

media/base/text_track.h

Index: media/base/text_track.h
diff --git a/media/base/text_track.h b/media/base/text_track.h
index 01a2ed727f90bc3ce9880796185b9ab782536c5d..38d717f4e08a7cbf5231e01ad1047195aa1a18e2 100644
--- a/media/base/text_track.h
+++ b/media/base/text_track.h
@@ -37,6 +37,21 @@ typedef base::Callback<scoped_ptr<TextTrack>
      const std::string& label,
      const std::string& language)> AddTextTrackCB;
 
+class DemuxerStream;
+
+typedef base::Callback<void
+    (DemuxerStream* text_stream,
+     scoped_ptr<TextTrack>)> AddTextTrackDoneCB;
+
+// TODO(matthewjheaney): temporary callback name until threading issues
+// have been settled.
+typedef base::Callback<void
+    (DemuxerStream* stream,
+     TextKind kind,
+     const std::string& label,
+     const std::string& language,
+     const AddTextTrackDoneCB& done_cb)> AddTextTrackCB2;
+
 }  // namespace media
 
 #endif  // MEDIA_BASE_TEXT_TRACK_H_