Roll libjingle 257:260.

content/renderer/media/media_stream_center.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/media_stream_center.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 28 matching lines @@
   // existing MediaStream.
   NOTIMPLEMENTED();
   return NULL;
 }
 
 template <class TrackList>
 static webrtc::MediaStreamTrackInterface* GetTrack(
     const std::string& source_id,
     TrackList* tracks) {
   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;
 }
 
 static webrtc::MediaStreamTrackInterface* GetNativeMediaStreamTrack(
       const WebKit::WebMediaStreamDescriptor& stream,
       const WebKit::WebMediaStreamComponent& component) {
   std::string source_id = UTF16ToUTF8(component.source().id());
   webrtc::MediaStreamInterface* native_stream = GetNativeMediaStream(stream);
@@ skipping 56 matching lines @@
 }
 
 void MediaStreamCenter::didCreateMediaStream(
     WebKit::WebMediaStreamDescriptor& stream) {
   if (!rtc_factory_)
     return;
   rtc_factory_->CreateNativeLocalMediaStream(&stream);
 }
 
 }  // namespace content