Add TextTrack.id and TextTrackList.getTrackById().

Contributed by self@brendanlong.com

BUG=313601

Review URL: https://codereview.chromium.org/85693006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237438 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 12 insertions, 6 deletions

diff --git a/media/base/pipeline_unittest.cc b/media/base/pipeline_unittest.cc
index ccd7e4e..a7a8cae 100644
--- a/media/base/pipeline_unittest.cc
+++ b/media/base/pipeline_unittest.cc
@@ -194,7 +194,7 @@ class PipelineTest : public ::testing::Test {
     EXPECT_CALL(*this, OnAddTextTrack(_,_))
         .WillOnce(Invoke(this, &PipelineTest::DoOnAddTextTrack));
     static_cast<DemuxerHost*>(pipeline_.get())->AddTextStream(text_stream(),
-                              TextTrackConfig(kTextSubtitles, "", ""));
+                              TextTrackConfig(kTextSubtitles, "", "", ""));
   }
 
   // Sets up expectations on the callback and initializes the pipeline.  Called
diff --git a/media/base/text_renderer_unittest.cc b/media/base/text_renderer_unittest.cc
index 0188763..77e8c47 100644
--- a/media/base/text_renderer_unittest.cc
+++ b/media/base/text_renderer_unittest.cc
@@ -86,7 +86,7 @@ class TextRendererTest : public testing::Test {
     if (expect_read)
       ExpectRead(idx);
 
-    const TextTrackConfig config(kind, name, language);
+    const TextTrackConfig config(kind, name, language, std::string());
     text_renderer_->AddTextStream(text_track_streams_.back(), config);
     message_loop_.RunUntilIdle();
 
diff --git a/media/base/text_track_config.cc b/media/base/text_track_config.cc
index 2d30fc6..0d4b11f6 100644
--- a/media/base/text_track_config.cc
+++ b/media/base/text_track_config.cc
@@ -12,16 +12,19 @@ TextTrackConfig::TextTrackConfig()
 
 TextTrackConfig::TextTrackConfig(TextKind kind,
                                  const std::string& label,
-                                 const std::string& language)
+                                 const std::string& language,
+                                 const std::string& id)
     : kind_(kind),
       label_(label),
-      language_(language) {
+      language_(language),
+      id_(id) {
 }
 
 bool TextTrackConfig::Matches(const TextTrackConfig& config) const {
   return config.kind() == kind_ &&
          config.label() == label_ &&
-         config.language() == language_;
+         config.language() == language_ &&
+         config.id() == id_;
 }
 
 }  // namespace media
diff --git a/media/base/text_track_config.h b/media/base/text_track_config.h
index 5619aec..58efba4 100644
--- a/media/base/text_track_config.h
+++ b/media/base/text_track_config.h
@@ -25,7 +25,8 @@ class MEDIA_EXPORT TextTrackConfig {
   TextTrackConfig();
   TextTrackConfig(TextKind kind,
                   const std::string& label,
-                  const std::string& language);
+                  const std::string& language,
+                  const std::string& id);
 
   // Returns true if all fields in |config| match this config.
   bool Matches(const TextTrackConfig& config) const;
@@ -33,11 +34,13 @@ class MEDIA_EXPORT TextTrackConfig {
   TextKind kind() const { return kind_; }
   const std::string& label() const { return label_; }
   const std::string& language() const { return language_; }
+  const std::string& id() const { return id_; }
 
  private:
   TextKind kind_;
   std::string label_;
   std::string language_;
+  std::string id_;
 };
 
 }  // namespace media