| Index: content/renderer/media/mock_media_stream_dependency_factory.cc
|
| diff --git a/content/renderer/media/mock_media_stream_dependency_factory.cc b/content/renderer/media/mock_media_stream_dependency_factory.cc
|
| index 5cbcbd4118c0dce83fe842726dbda0ffeb3577ff..71adfb41700114fbb53f56528b4c02ca4c6d5281 100644
|
| --- a/content/renderer/media/mock_media_stream_dependency_factory.cc
|
| +++ b/content/renderer/media/mock_media_stream_dependency_factory.cc
|
| @@ -5,7 +5,125 @@
|
| #include "base/logging.h"
|
| #include "content/renderer/media/mock_media_stream_dependency_factory.h"
|
| #include "content/renderer/media/mock_peer_connection_impl.h"
|
| -#include "third_party/libjingle/source/talk/session/phone/webrtcmediaengine.h"
|
| +#include "third_party/libjingle/source/talk/app/webrtc/mediastream.h"
|
| +#include "third_party/libjingle/source/talk/base/scoped_ref_ptr.h"
|
| +
|
| +namespace webrtc {
|
| +
|
| +template <class TrackType>
|
| +class MockMediaStreamTrackList
|
| + : public MediaStreamTrackListInterface<TrackType> {
|
| + public:
|
| + virtual size_t count() OVERRIDE {
|
| + return tracks_.size();
|
| + }
|
| + virtual TrackType* at(size_t index) OVERRIDE {
|
| + return tracks_[index];
|
| + }
|
| + void AddTrack(TrackType* track) {
|
| + tracks_.push_back(track);
|
| + }
|
| +
|
| + protected:
|
| + virtual ~MockMediaStreamTrackList() {}
|
| +
|
| + private:
|
| + std::vector<TrackType*> tracks_;
|
| +};
|
| +
|
| +typedef MockMediaStreamTrackList<AudioTrackInterface> MockAudioTracks;
|
| +typedef MockMediaStreamTrackList<VideoTrackInterface> MockVideoTracks;
|
| +
|
| +class MockLocalMediaStream : public LocalMediaStreamInterface {
|
| + public:
|
| + explicit MockLocalMediaStream(std::string label)
|
| + : label_(label),
|
| + audio_tracks_(new talk_base::RefCountedObject<MockAudioTracks>),
|
| + video_tracks_(new talk_base::RefCountedObject<MockVideoTracks>) {
|
| + }
|
| + virtual bool AddTrack(AudioTrackInterface* track) OVERRIDE {
|
| + audio_tracks_->AddTrack(track);
|
| + return true;
|
| + }
|
| + virtual bool AddTrack(VideoTrackInterface* track) OVERRIDE {
|
| + video_tracks_->AddTrack(track);
|
| + return true;
|
| + }
|
| + virtual std::string label() const OVERRIDE { return label_; }
|
| + virtual AudioTracks* audio_tracks() OVERRIDE {
|
| + return audio_tracks_;
|
| + }
|
| + virtual VideoTracks* video_tracks() OVERRIDE {
|
| + return video_tracks_;
|
| + }
|
| + virtual ReadyState ready_state() OVERRIDE {
|
| + NOTIMPLEMENTED();
|
| + return kInitializing;
|
| + }
|
| + virtual void set_ready_state(ReadyState state) OVERRIDE { NOTIMPLEMENTED(); }
|
| + virtual void RegisterObserver(ObserverInterface* observer) OVERRIDE {
|
| + NOTIMPLEMENTED();
|
| + }
|
| + virtual void UnregisterObserver(ObserverInterface* observer) {
|
| + NOTIMPLEMENTED();
|
| + }
|
| +
|
| + protected:
|
| + virtual ~MockLocalMediaStream() {}
|
| +
|
| + private:
|
| + std::string label_;
|
| + talk_base::scoped_refptr<MockAudioTracks> audio_tracks_;
|
| + talk_base::scoped_refptr<MockVideoTracks> video_tracks_;
|
| +};
|
| +
|
| +cricket::VideoCapturer* MockLocalVideoTrack::GetVideoCapture() {
|
| + NOTIMPLEMENTED();
|
| + return NULL;
|
| +}
|
| +
|
| +void MockLocalVideoTrack::SetRenderer(VideoRendererWrapperInterface* renderer) {
|
| + renderer_ = renderer;
|
| +}
|
| +
|
| +VideoRendererWrapperInterface* MockLocalVideoTrack::GetRenderer() {
|
| + NOTIMPLEMENTED();
|
| + return NULL;
|
| +}
|
| +
|
| +std::string MockLocalVideoTrack::kind() const {
|
| + NOTIMPLEMENTED();
|
| + return "";
|
| +}
|
| +
|
| +std::string MockLocalVideoTrack::label() const { return label_; }
|
| +
|
| +bool MockLocalVideoTrack::enabled() const { return enabled_; }
|
| +
|
| +MockLocalVideoTrack::TrackState MockLocalVideoTrack::state() const {
|
| + NOTIMPLEMENTED();
|
| + return kInitializing;
|
| +}
|
| +
|
| +bool MockLocalVideoTrack::set_enabled(bool enable) {
|
| + enabled_ = enable;
|
| + return true;
|
| +}
|
| +
|
| +bool MockLocalVideoTrack::set_state(TrackState new_state) {
|
| + NOTIMPLEMENTED();
|
| + return false;
|
| +}
|
| +
|
| +void MockLocalVideoTrack::RegisterObserver(ObserverInterface* observer) {
|
| + NOTIMPLEMENTED();
|
| +}
|
| +
|
| +void MockLocalVideoTrack::UnregisterObserver(ObserverInterface* observer) {
|
| + NOTIMPLEMENTED();
|
| +}
|
| +
|
| +} // namespace webrtc
|
|
|
| MockMediaStreamDependencyFactory::MockMediaStreamDependencyFactory()
|
| : mock_pc_factory_created_(false) {
|
| @@ -13,20 +131,17 @@ MockMediaStreamDependencyFactory::MockMediaStreamDependencyFactory()
|
|
|
| MockMediaStreamDependencyFactory::~MockMediaStreamDependencyFactory() {}
|
|
|
| -cricket::WebRtcMediaEngine*
|
| -MockMediaStreamDependencyFactory::CreateWebRtcMediaEngine() {
|
| - return new cricket::WebRtcMediaEngine(NULL, NULL, NULL);
|
| -}
|
| -
|
| bool MockMediaStreamDependencyFactory::CreatePeerConnectionFactory(
|
| - cricket::MediaEngineInterface* media_engine,
|
| - talk_base::Thread* worker_thread) {
|
| + talk_base::Thread* worker_thread,
|
| + talk_base::Thread* signaling_thread,
|
| + content::P2PSocketDispatcher* socket_dispatcher,
|
| + talk_base::NetworkManager* network_manager,
|
| + talk_base::PacketSocketFactory* socket_factory) {
|
| mock_pc_factory_created_ = true;
|
| - media_engine_.reset(media_engine);
|
| return true;
|
| }
|
|
|
| -void MockMediaStreamDependencyFactory::DeletePeerConnectionFactory() {
|
| +void MockMediaStreamDependencyFactory::ReleasePeerConnectionFactory() {
|
| mock_pc_factory_created_ = false;
|
| }
|
|
|
| @@ -34,17 +149,35 @@ bool MockMediaStreamDependencyFactory::PeerConnectionFactoryCreated() {
|
| return mock_pc_factory_created_;
|
| }
|
|
|
| -cricket::PortAllocator* MockMediaStreamDependencyFactory::CreatePortAllocator(
|
| - content::P2PSocketDispatcher* socket_dispatcher,
|
| - talk_base::NetworkManager* network_manager,
|
| - talk_base::PacketSocketFactory* socket_factory,
|
| - const webkit_glue::P2PTransport::Config& config) {
|
| - return NULL;
|
| +talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
|
| +MockMediaStreamDependencyFactory::CreatePeerConnection(
|
| + const std::string& config,
|
| + webrtc::PeerConnectionObserver* observer) {
|
| + DCHECK(mock_pc_factory_created_);
|
| + return new talk_base::RefCountedObject<webrtc::MockPeerConnectionImpl>();
|
| }
|
|
|
| -webrtc::PeerConnection* MockMediaStreamDependencyFactory::CreatePeerConnection(
|
| - cricket::PortAllocator* port_allocator,
|
| - talk_base::Thread* signaling_thread) {
|
| - DCHECK(mock_pc_factory_created_);
|
| - return new webrtc::MockPeerConnectionImpl();
|
| +talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface>
|
| +MockMediaStreamDependencyFactory::CreateLocalMediaStream(
|
| + const std::string& label) {
|
| + talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface> stream(
|
| + new talk_base::RefCountedObject<webrtc::MockLocalMediaStream>(label));
|
| + return stream;
|
| +}
|
| +
|
| +talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface>
|
| +MockMediaStreamDependencyFactory::CreateLocalVideoTrack(
|
| + const std::string& label,
|
| + cricket::VideoCapturer* video_device) {
|
| + talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface> stream(
|
| + new talk_base::RefCountedObject<webrtc::MockLocalVideoTrack>(label));
|
| + return stream;
|
| +}
|
| +
|
| +talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface>
|
| +MockMediaStreamDependencyFactory::CreateLocalAudioTrack(
|
| + const std::string& label,
|
| + webrtc::AudioDeviceModule* audio_device) {
|
| + NOTIMPLEMENTED();
|
| + return NULL;
|
| }
|
|
|