Remove the index of in-band tracks on the Chromium side

Note: https://codereview.chromium.org/754963009 removes the usage of
textTrackIndex() and has to be applied first.

BUG=440777
R=philipj@opera.com

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

Cr-Commit-Position: refs/heads/master@{#308063}

4 files changed, 4 insertions, 19 deletions

diff --git a/media/blink/webinbandtexttrack_impl.cc b/media/blink/webinbandtexttrack_impl.cc
index 49a4880..720cd43 100644
--- a/media/blink/webinbandtexttrack_impl.cc
+++ b/media/blink/webinbandtexttrack_impl.cc
@@ -12,14 +12,12 @@ WebInbandTextTrackImpl::WebInbandTextTrackImpl(
     Kind kind,
     const blink::WebString& label,
     const blink::WebString& language,
-    const blink::WebString& id,
-    int index)
+    const blink::WebString& id)
     : client_(NULL),
       kind_(kind),
       label_(label),
       language_(language),
-      id_(id),
-      index_(index) {
+      id_(id) {
 }
 
 WebInbandTextTrackImpl::~WebInbandTextTrackImpl() {
@@ -51,8 +49,4 @@ blink::WebString WebInbandTextTrackImpl::id() const {
   return id_;
 }
 
-int WebInbandTextTrackImpl::textTrackIndex() const {
-  return index_;
-}
-
 }  // namespace media
diff --git a/media/blink/webinbandtexttrack_impl.h b/media/blink/webinbandtexttrack_impl.h
index c08bfad..9c75cae 100644
--- a/media/blink/webinbandtexttrack_impl.h
+++ b/media/blink/webinbandtexttrack_impl.h
@@ -15,8 +15,7 @@ class WebInbandTextTrackImpl : public blink::WebInbandTextTrack {
   WebInbandTextTrackImpl(Kind kind,
                          const blink::WebString& label,
                          const blink::WebString& language,
-                         const blink::WebString& id,
-                         int index);
+                         const blink::WebString& id);
   virtual ~WebInbandTextTrackImpl();
 
   virtual void setClient(blink::WebInbandTextTrackClient* client);
@@ -28,15 +27,12 @@ class WebInbandTextTrackImpl : public blink::WebInbandTextTrack {
   virtual blink::WebString language() const;
   virtual blink::WebString id() const;
 
-  virtual int textTrackIndex() const;
-
  private:
   blink::WebInbandTextTrackClient* client_;
   Kind kind_;
   blink::WebString label_;
   blink::WebString language_;
   blink::WebString id_;
-  int index_;
   DISALLOW_COPY_AND_ASSIGN(WebInbandTextTrackImpl);
 };
 
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
index 06eaa5a..d712f95 100644
--- a/media/blink/webmediaplayer_impl.cc
+++ b/media/blink/webmediaplayer_impl.cc
@@ -159,7 +159,6 @@ WebMediaPlayerImpl::WebMediaPlayerImpl(
       compositor_(new VideoFrameCompositor(
           BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnNaturalSizeChanged),
           BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnOpacityChanged))),
-      text_track_index_(0),
       encrypted_media_support_(
           cdm_factory.Pass(),
           client,
@@ -851,8 +850,7 @@ void WebMediaPlayerImpl::OnAddTextTrack(
       blink::WebString::fromUTF8(config.id());
 
   scoped_ptr<WebInbandTextTrackImpl> web_inband_text_track(
-      new WebInbandTextTrackImpl(web_kind, web_label, web_language, web_id,
-                                 text_track_index_++));
+      new WebInbandTextTrackImpl(web_kind, web_label, web_language, web_id));
 
   scoped_ptr<TextTrack> text_track(new TextTrackImpl(
       main_task_runner_, client_, web_inband_text_track.Pass()));
diff --git a/media/blink/webmediaplayer_impl.h b/media/blink/webmediaplayer_impl.h
index a4f5278..07f1932 100644
--- a/media/blink/webmediaplayer_impl.h
+++ b/media/blink/webmediaplayer_impl.h
@@ -306,9 +306,6 @@ class MEDIA_EXPORT WebMediaPlayerImpl
   // playback.
   scoped_ptr<cc_blink::WebLayerImpl> video_weblayer_;
 
-  // Text track objects get a unique index value when they're created.
-  int text_track_index_;
-
   EncryptedMediaPlayerSupport encrypted_media_support_;
 
   scoped_ptr<RendererFactory> renderer_factory_;