content/renderer/media/mock_media_stream_dependency_factory.h - Issue 12383016: Merge AssociateStreamWithProducer message into CreateStream message for both audio output and input.

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 12383016: Merge AssociateStreamWithProducer message into CreateStream message for both audio output and input. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 10 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

« content/renderer/media/audio_message_filter.cc ('K') | « content/renderer/media/media_stream_impl.cc ('k') | content/renderer/media/mock_media_stream_dependency_factory.cc » ('j') | media/audio/audio_input_device.h » ('J')
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 e7c4221a381d04e05879d15a5cb0d9e15b8ab2c8..54ffcf04fbdb8361bc5663523747d726f2066596 100644

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

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

@@ -142,7 +142,7 @@ class MockMediaStreamDependencyFactory : public MediaStreamDependencyFactory {

bool is_screencast,

const webrtc::MediaConstraintsInterface* constraints) OVERRIDE;

virtual bool InitializeAudioSource(

- const StreamDeviceInfo& device_info) OVERRIDE;

+ int render_view_id, const StreamDeviceInfo& device_info) OVERRIDE;

virtual bool CreateWebAudioSource(

WebKit::WebMediaStreamSource* source) OVERRIDE;

virtual scoped_refptr<webrtc::MediaStreamInterface>