Roll libjingle 257:260.

content/renderer/media/media_stream_impl_unittest.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 "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "content/renderer/media/media_stream_extra_data.h"
 #include "content/renderer/media/media_stream_impl.h"
 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
@@ skipping 94 matching lines @@
     if (!extra_data || !extra_data->local_stream()) {
       ADD_FAILURE();
       return desc;
     }
 
     if (audio)
       EXPECT_EQ(1u, extra_data->local_stream()->audio_tracks()->count());
     if (video)
       EXPECT_EQ(1u, extra_data->local_stream()->video_tracks()->count());
     if (audio && video) {
-      EXPECT_NE(extra_data->local_stream()->audio_tracks()->at(0)->label(),
-                extra_data->local_stream()->video_tracks()->at(0)->label());
+      EXPECT_NE(extra_data->local_stream()->audio_tracks()->at(0)->id(),
+                extra_data->local_stream()->video_tracks()->at(0)->id());
     }
     return desc;
   }
 
 
   void FakeMediaStreamDispatcherComplete() {
     ms_impl_->OnStreamGenerated(ms_dispatcher_->request_id(),
                                 ms_dispatcher_->stream_label(),
                                 ms_dispatcher_->audio_array(),
                                 ms_dispatcher_->video_array());
@@ skipping 108 matching lines @@
                                                                         true);
   EXPECT_EQ(0, ms_dispatcher_->stop_stream_counter());
   EXPECT_EQ(1, ms_dispatcher_->request_stream_counter());
   ms_impl_->FrameWillClose(NULL);
   EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());
   ms_impl_->OnLocalMediaStreamStop(mixed_desc.label().utf8());
   EXPECT_EQ(1, ms_dispatcher_->stop_stream_counter());
 }
 
 }  // namespace content