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

Issues Search
    My Issues | Starred     Open | Closed | All

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: fixing unittests 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:
View side-by-side diff with in-line comments
Download patch
« media/audio/audio_input_controller.cc ('K') | « media/audio/audio_manager_base.cc ('k') | media/audio/linux/alsa_output_unittest.cc » ('j') | media/audio/linux/audio_manager_linux.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..d580ab0a3fb6d1aa8fc1e8fef60ba893e5fa71f3 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_uid));
MOCK_METHOD0(MuteAll, void());
MOCK_METHOD0(UnMuteAll, void());
MOCK_METHOD0(CanShowAudioInputSettings, bool());
« media/audio/audio_input_controller.cc ('K') | « media/audio/audio_manager_base.cc ('k') | media/audio/linux/alsa_output_unittest.cc » ('j') | media/audio/linux/audio_manager_linux.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698