Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(519)

Unified Diff: content/renderer/media/mock_media_stream_dependency_factory.h

Issue 9284020: Enabling usage of native PeerConnection v2 in libjingle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/mock_media_stream_dependency_factory.h
diff --git a/content/renderer/media/mock_media_stream_dependency_factory.h b/content/renderer/media/mock_media_stream_dependency_factory.h
index 163baabc4401c62990cf6fa2fd20b97ba3cebbe3..5deec6407eff2558a3f00c7be25eaaf56b603ae9 100644
--- a/content/renderer/media/mock_media_stream_dependency_factory.h
+++ b/content/renderer/media/mock_media_stream_dependency_factory.h
@@ -5,6 +5,8 @@
#ifndef CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
#define CONTENT_RENDERER_MEDIA_MOCK_MEDIA_STREAM_DEPENDENCY_FACTORY_H_
+#include <string>
+
#include "base/compiler_specific.h"
#include "content/renderer/media/media_stream_dependency_factory.h"
@@ -14,24 +16,31 @@ class MockMediaStreamDependencyFactory : public MediaStreamDependencyFactory {
MockMediaStreamDependencyFactory();
virtual ~MockMediaStreamDependencyFactory();
- virtual cricket::WebRtcMediaEngine* CreateWebRtcMediaEngine() OVERRIDE;
virtual bool CreatePeerConnectionFactory(
- cricket::MediaEngineInterface* media_engine,
- talk_base::Thread* worker_thread) OVERRIDE;
- virtual void DeletePeerConnectionFactory() OVERRIDE;
- virtual bool PeerConnectionFactoryCreated() OVERRIDE;
- virtual cricket::PortAllocator* CreatePortAllocator(
+ talk_base::Thread* worker_thread,
+ talk_base::Thread* signaling_thread,
content::P2PSocketDispatcher* socket_dispatcher,
talk_base::NetworkManager* network_manager,
- talk_base::PacketSocketFactory* socket_factory,
- const webkit_glue::P2PTransport::Config& config) OVERRIDE;
- virtual webrtc::PeerConnection* CreatePeerConnection(
- cricket::PortAllocator* port_allocator,
- talk_base::Thread* signaling_thread) OVERRIDE;
+ talk_base::PacketSocketFactory* socket_factory) OVERRIDE;
+ virtual void ReleasePeerConnectionFactory() OVERRIDE;
+ virtual bool PeerConnectionFactoryCreated() OVERRIDE;
+ virtual talk_base::scoped_refptr<webrtc::PeerConnectionInterface>
+ CreatePeerConnection(
+ const std::string& config,
+ webrtc::PeerConnectionObserver* observer) OVERRIDE;
+ virtual talk_base::scoped_refptr<webrtc::LocalMediaStreamInterface>
+ CreateLocalMediaStream(const std::string& label) OVERRIDE;
+ virtual talk_base::scoped_refptr<webrtc::LocalVideoTrackInterface>
+ CreateLocalVideoTrack(
+ const std::string& label,
+ cricket::VideoCapturer* video_device) OVERRIDE;
+ virtual talk_base::scoped_refptr<webrtc::LocalAudioTrackInterface>
+ CreateLocalAudioTrack(
+ const std::string& label,
+ webrtc::AudioDeviceModule* audio_device) OVERRIDE;
private:
bool mock_pc_factory_created_;
- scoped_ptr<cricket::MediaEngineInterface> media_engine_;
DISALLOW_COPY_AND_ASSIGN(MockMediaStreamDependencyFactory);
};

Powered by Google App Engine
This is Rietveld 408576698