Roll libjingle 257:260.

content/renderer/media/peer_connection_handler_base.cc

 // Copyright (c) 2012 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 "content/renderer/media/peer_connection_handler_base.h"
 
 #include "base/logging.h"
 #include "base/utf_string_conversions.h"
 #include "content/renderer/media/media_stream_dependency_factory.h"
 #include "content/renderer/media/media_stream_extra_data.h"
@@ skipping 11 matching lines @@
       static_cast<MediaStreamExtraData*>(stream.extraData());
   if (extra_data)
     return extra_data->local_stream();
   return NULL;
 }
 
 template <class TrackList>
 static webrtc::MediaStreamTrackInterface* GetLocalTrack(
     const std::string& source_id,
     TrackList* tracks) {
-  // TODO(hta): Look at MediaStreamTrackInterface - lookup by ID belongs below.
   for (size_t i = 0; i < tracks->count(); ++i) {
-    if (tracks->at(i)->label() == source_id)
+    if (tracks->at(i)->id() == source_id)
       return tracks->at(i);
   }
   return NULL;
 }
 
 PeerConnectionHandlerBase::PeerConnectionHandlerBase(
     MediaStreamDependencyFactory* dependency_factory)
     : dependency_factory_(dependency_factory),
       message_loop_proxy_(base::MessageLoopProxy::current()) {
 }
@@ skipping 29 matching lines @@
       audio_tracks->count());
   WebKit::WebVector<WebKit::WebMediaStreamSource> video_source_vector(
       video_tracks->count());
 
   // Add audio tracks.
   size_t i = 0;
   for (; i < audio_tracks->count(); ++i) {
     webrtc::AudioTrackInterface* audio_track = audio_tracks->at(i);
     DCHECK(audio_track);
     audio_source_vector[i].initialize(
-        UTF8ToUTF16(audio_track->label()),
+        UTF8ToUTF16(audio_track->id()),
         WebKit::WebMediaStreamSource::TypeAudio,
-        UTF8ToUTF16(audio_track->label()));
+        UTF8ToUTF16(audio_track->id()));
   }
 
   // Add video tracks.
   for (i = 0; i < video_tracks->count(); ++i) {
     webrtc::VideoTrackInterface* video_track = video_tracks->at(i);
     DCHECK(video_track);
     video_source_vector[i].initialize(
-        UTF8ToUTF16(video_track->label()),
+        UTF8ToUTF16(video_track->id()),
         WebKit::WebMediaStreamSource::TypeVideo,
-        UTF8ToUTF16(video_track->label()));
+        UTF8ToUTF16(video_track->id()));
   }
   WebKit::WebMediaStreamDescriptor descriptor;
   descriptor.initialize(UTF8ToUTF16(stream->label()),
                         audio_source_vector, video_source_vector);
   descriptor.setExtraData(new MediaStreamExtraData(stream));
   return descriptor;
 }
 
 webrtc::MediaStreamTrackInterface*
 PeerConnectionHandlerBase::GetLocalNativeMediaStreamTrack(
@@ skipping 11 matching lines @@
   }
   if (component.source().type() == WebKit::WebMediaStreamSource::TypeVideo) {
     return GetLocalTrack<webrtc::VideoTracks>(
         source_id, native_stream->video_tracks());
   }
   NOTIMPLEMENTED();  // We have an unknown type of media stream track.
   return NULL;
 }
 
 }  // namespace content