Roll libjingle 257:260.

content/renderer/media/mock_media_stream_dependency_factory.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/mock_media_stream_dependency_factory.h"
 
 #include "base/logging.h"
 #include "content/renderer/media/mock_peer_connection_impl.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediastreaminterface.h"
 #include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h"
@@ skipping 115 matching lines @@
   DCHECK_NE(MediaSourceInterface::kEnded, state_);
   state_ = MediaSourceInterface::kEnded;
   if (observer_)
     observer_->OnChanged();
 }
 
 webrtc::MediaSourceInterface::SourceState MockVideoSource::state() const {
   return state_;
 }
 
-MockLocalVideoTrack::MockLocalVideoTrack(std::string label,
+MockLocalVideoTrack::MockLocalVideoTrack(std::string id,
                                          webrtc::VideoSourceInterface* source)
     : enabled_(false),
-      label_(label),
+      id_(id),
       source_(source) {
 }
 
 MockLocalVideoTrack::~MockLocalVideoTrack() {}
 
 void MockLocalVideoTrack::AddRenderer(VideoRendererInterface* renderer) {
   NOTIMPLEMENTED();
 }
 
 void MockLocalVideoTrack::RemoveRenderer(VideoRendererInterface* renderer) {
   NOTIMPLEMENTED();
 }
 
 cricket::VideoRenderer* MockLocalVideoTrack::FrameInput() {
   NOTIMPLEMENTED();
   return NULL;
 }
 
 std::string MockLocalVideoTrack::kind() const {
   NOTIMPLEMENTED();
   return "";
 }
 
-std::string MockLocalVideoTrack::label() const { return label_; }
+std::string MockLocalVideoTrack::id() const { return id_; }
 
 bool MockLocalVideoTrack::enabled() const { return enabled_; }
 
 MockLocalVideoTrack::TrackState MockLocalVideoTrack::state() const {
   NOTIMPLEMENTED();
   return kInitializing;
 }
 
 bool MockLocalVideoTrack::set_enabled(bool enable) {
   enabled_ = enable;
@@ skipping 15 matching lines @@
 
 VideoSourceInterface* MockLocalVideoTrack::GetSource() const {
   return source_;
 }
 
 std::string MockLocalAudioTrack::kind() const {
   NOTIMPLEMENTED();
   return "";
 }
 
-std::string MockLocalAudioTrack::label() const { return label_; }
+std::string MockLocalAudioTrack::id() const { return id_; }
 
 bool MockLocalAudioTrack::enabled() const { return enabled_; }
 
 MockLocalVideoTrack::TrackState MockLocalAudioTrack::state() const {
   NOTIMPLEMENTED();
   return kInitializing;
 }
 
 bool MockLocalAudioTrack::set_enabled(bool enable) {
   enabled_ = enable;
@@ skipping 140 matching lines @@
 
 scoped_refptr<webrtc::LocalMediaStreamInterface>
 MockMediaStreamDependencyFactory::CreateLocalMediaStream(
     const std::string& label) {
   DCHECK(mock_pc_factory_created_);
   return new talk_base::RefCountedObject<MockLocalMediaStream>(label);
 }
 
 scoped_refptr<webrtc::VideoTrackInterface>
 MockMediaStreamDependencyFactory::CreateLocalVideoTrack(
-    const std::string& label,
+    const std::string& id,
     webrtc::VideoSourceInterface* source) {
   DCHECK(mock_pc_factory_created_);
   scoped_refptr<webrtc::VideoTrackInterface> track(
       new talk_base::RefCountedObject<MockLocalVideoTrack>(
-          label, source));
+          id, source));
   return track;
 }
 
 scoped_refptr<webrtc::LocalAudioTrackInterface>
 MockMediaStreamDependencyFactory::CreateLocalAudioTrack(
-    const std::string& label,
+    const std::string& id,
     webrtc::AudioDeviceModule* audio_device) {
   DCHECK(mock_pc_factory_created_);
   scoped_refptr<webrtc::LocalAudioTrackInterface> track(
-      new talk_base::RefCountedObject<MockLocalAudioTrack>(label));
+      new talk_base::RefCountedObject<MockLocalAudioTrack>(id));
   return track;
 }
 
 SessionDescriptionInterface*
 MockMediaStreamDependencyFactory::CreateSessionDescription(
-    const std::string& sdp) {
-  return CreateSessionDescription ("unknown", sdp);
-}
-
-SessionDescriptionInterface*
-MockMediaStreamDependencyFactory::CreateSessionDescription(
       const std::string& type,
       const std::string& sdp) {
   return new MockSessionDescription(type, sdp);
 }
 
 webrtc::IceCandidateInterface*
 MockMediaStreamDependencyFactory::CreateIceCandidate(
     const std::string& sdp_mid,
     int sdp_mline_index,
     const std::string& sdp) {
   return new MockIceCandidate(sdp_mid, sdp_mline_index, sdp);
 }
 
 void MockMediaStreamDependencyFactory::SetAudioDeviceSessionId(int session_id) {
 }
 
 }  // namespace content