media/audio/audio_output_proxy_unittest.cc - Issue 8491044: Link things together and enable the device selection for linux and mac.

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: media/audio/audio_output_proxy_unittest.cc

Issue 8491044: Link things together and enable the device selection for linux and mac. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/

Patch Set: rebase2 Created 9 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: media/audio/audio_output_proxy_unittest.cc

diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc

index 50a5020586e89b972a9e08ed97bf0aae589da3fe..c5d2e9e72c4b631310fc4d05bacb8972d5e350d4 100644

--- a/media/audio/audio_output_proxy_unittest.cc

+++ b/media/audio/audio_output_proxy_unittest.cc

@@ -44,8 +44,8 @@ class MockAudioManager : public AudioManager {

const AudioParameters& params));

MOCK_METHOD1(MakeAudioOutputStreamProxy, AudioOutputStream*(

const AudioParameters& params));

- MOCK_METHOD1(MakeAudioInputStream, AudioInputStream*(

- const AudioParameters& params));

+ MOCK_METHOD2(MakeAudioInputStream, AudioInputStream*(

+ const AudioParameters& params, const std::string& device_id));

MOCK_METHOD0(MuteAll, void());

MOCK_METHOD0(UnMuteAll, void());

MOCK_METHOD0(CanShowAudioInputSettings, bool());

« no previous file with comments | « media/audio/audio_manager_base.cc ('k') | media/audio/linux/alsa_output_unittest.cc » ('j') | no next file with comments »