Render inband text tracks in the media pipeline

media/webm/webm_tracks_parser_unittest.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/logging.h"
 #include "media/webm/tracks_builder.h"
 #include "media/webm/webm_constants.h"
 #include "media/webm/webm_tracks_parser.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 19 matching lines @@
   int result = parser->Parse(buffer, buffer_size);
   EXPECT_GT(result, 0);
   EXPECT_EQ(result, buffer_size);
 
   const WebMTracksParser::TextTracks& text_tracks = parser->text_tracks();
   EXPECT_EQ(text_tracks.size(), WebMTracksParser::TextTracks::size_type(1));
 
   const WebMTracksParser::TextTracks::const_iterator itr = text_tracks.begin();
   EXPECT_EQ(itr->first, 1);  // track num
 
-  const WebMTracksParser::TextTrackInfo& info = itr->second;
-  EXPECT_EQ(info.kind, text_kind);
-  EXPECT_TRUE(info.name == name);
-  EXPECT_TRUE(info.language == language);
+  const TextTrackConfig& config = itr->second;
+  EXPECT_EQ(config.kind(), text_kind);
+  EXPECT_TRUE(config.label() == name);
+  EXPECT_TRUE(config.language() == language);
 }
 
 TEST_F(WebMTracksParserTest, SubtitleNoNameNoLang) {
   InSequence s;
 
   TracksBuilder tb;
   tb.AddTrack(1, kWebMTrackTypeSubtitlesOrCaptions,
               kWebMCodecSubtitles, "", "");
 
   const std::vector<uint8> buf = tb.Finish();
@@ skipping 59 matching lines @@
   parser.reset(new WebMTracksParser(LogCB(), false));
 
   result = parser->Parse(&buf[0], buf.size());
   EXPECT_GT(result, 0);
 
   EXPECT_EQ(parser->ignored_tracks().size(), 0u);
   EXPECT_EQ(parser->text_tracks().size(), 2u);
 }
 
 }  // namespace media