content/renderer/media/mock_media_stream_dependency_factory.h - Issue 131763002: Adds MediaStreamSource, MediaStreamAudioSource and MediaStreamVideoCaptureDeviceSource

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 131763002: Adds MediaStreamSource, MediaStreamAudioSource and MediaStreamVideoCaptureDeviceSource (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased Created 6 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

« no previous file with comments | « content/renderer/media/media_stream_video_source_unittest.cc ('k') | content/renderer/media/mock_media_stream_dependency_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 f9f3c330ee5337d9f591199093dcc7507e18e8cc..ad4241ebec046f7e09c32a0e6d0ba10abdab64e4 100644

--- a/content/renderer/media/mock_media_stream_dependency_factory.h

+++ b/content/renderer/media/mock_media_stream_dependency_factory.h

@@ -147,11 +147,8 @@ class MockMediaStreamDependencyFactory : public MediaStreamDependencyFactory {

virtual scoped_refptr<webrtc::AudioSourceInterface>

CreateLocalAudioSource(

const webrtc::MediaConstraintsInterface* constraints) OVERRIDE;

- virtual scoped_refptr<webrtc::VideoSourceInterface>

- CreateLocalVideoSource(

- int video_session_id,

- bool is_screencast,

- const webrtc::MediaConstraintsInterface* constraints) OVERRIDE;

+ virtual cricket::VideoCapturer* CreateVideoCapturer(

+ const StreamDeviceInfo& info) OVERRIDE;

virtual scoped_refptr<webrtc::VideoSourceInterface>

CreateVideoSource(

cricket::VideoCapturer* capturer,

@@ -181,9 +178,6 @@ class MockMediaStreamDependencyFactory : public MediaStreamDependencyFactory {

int sdp_mline_index,

const std::string& sdp) OVERRIDE;

- virtual bool EnsurePeerConnectionFactory() OVERRIDE;

- virtual bool PeerConnectionFactoryCreated() OVERRIDE;

virtual scoped_refptr<WebRtcAudioCapturer> CreateAudioCapturer(

int render_view_id, const StreamDeviceInfo& device_info,

const blink::WebMediaConstraints& constraints) OVERRIDE;

@@ -192,7 +186,6 @@ class MockMediaStreamDependencyFactory : public MediaStreamDependencyFactory {

MockVideoSource* last_video_source() { return last_video_source_.get(); }

private:

- bool mock_pc_factory_created_;

scoped_refptr <MockAudioSource> last_audio_source_;

scoped_refptr <MockVideoSource> last_video_source_;