Roll libjingle 257:260.

content/renderer/media/rtc_video_decoder_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 "content/renderer/media/rtc_video_decoder.h"
 
 #include <deque>
 
 #include "base/bind.h"
 #include "base/memory/singleton.h"
@@ skipping 108 matching lines @@
 class MockVideoTrack : public webrtc::VideoTrackInterface {
  public:
   static MockVideoTrack* Create() {
     return new talk_base::RefCountedObject<MockVideoTrack>();
   }
 
   virtual std::string kind() const OVERRIDE {
     NOTIMPLEMENTED();
     return "";
   }
-  virtual std::string label() const OVERRIDE {
+  virtual std::string id() const OVERRIDE {
     NOTIMPLEMENTED();
     return "";
   }
   virtual bool enabled() const OVERRIDE {
     NOTIMPLEMENTED();
     return false;
   }
   virtual TrackState state() const OVERRIDE {
     NOTIMPLEMENTED();
     return kEnded;
@@ skipping 191 matching lines @@
   Stop();
 
   // Any read after stopping should be immediately satisfied.
   EXPECT_CALL(*this, FrameReady(media::VideoDecoder::kOk,
                                 scoped_refptr<media::VideoFrame>()));
   decoder_->Read(read_cb_);
   message_loop_.RunUntilIdle();
 }
 
 }  // namespace content