Generate and assign media track ids in demuxers.

third_party/WebKit/Source/core/html/track/TrackListBase.h

 // Copyright 2014 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.
 
 #ifndef TrackListBase_h
 #define TrackListBase_h
 
 #include "core/events/EventTarget.h"
 
 #include "core/html/HTMLMediaElement.h"
@@ skipping 18 matching lines @@
     T* anonymousIndexedGetter(unsigned index) const
     {
         if (index >= m_tracks.size())
             return nullptr;
         return m_tracks[index].get();
     }
 
     T* getTrackById(const String& id) const
     {
         for (unsigned i = 0; i < m_tracks.size(); ++i) {
-            if (m_tracks[i]->id() == id)
+            if (String(m_tracks[i]->id()) == id)
                 return m_tracks[i].get();
         }
 
         return nullptr;
     }
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(change);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack);
 
     // EventTarget interface
     ExecutionContext* getExecutionContext() const override
     {
         if (m_mediaElement)
             return m_mediaElement->getExecutionContext();
         return nullptr;
     }
 
     void add(T* track)
     {
         track->setMediaElement(m_mediaElement);
         m_tracks.append(track);
         scheduleTrackEvent(EventTypeNames::addtrack, track);
     }
 
     void remove(WebMediaPlayer::TrackId trackId)
     {
         for (unsigned i = 0; i < m_tracks.size(); ++i) {
-            if (m_tracks[i]->trackId() != trackId)
+            if (m_tracks[i]->id() != trackId)
                 continue;
 
             m_tracks[i]->setMediaElement(0);
             scheduleTrackEvent(EventTypeNames::removetrack, m_tracks[i]);
             m_tracks.remove(i);
             return;
         }
         NOTREACHED();
     }
 
@@ skipping 36 matching lines @@
         m_mediaElement->scheduleEvent(event);
     }
 
     HeapVector<Member<T>> m_tracks;
     Member<HTMLMediaElement> m_mediaElement;
 };
 
 } // namespace blink
 
 #endif