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

Unified Diff: media/audio/mock_audio_manager.cc

Issue 2692203003: Switching AudioOutputAuthorizationHandler from using AudioManager interface to AudioSystem one. (Closed)
Patch Set: AudioSystem comments updated according to discussion with tommi@ Created 3 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
« media/audio/audio_system_impl.cc ('K') | « media/audio/mock_audio_manager.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/mock_audio_manager.cc
diff --git a/media/audio/mock_audio_manager.cc b/media/audio/mock_audio_manager.cc
index 931cdbb7d91219532b1542c43d6f3f5ad1c87d6e..9dcb9e51b1862b71aab79a58902849a62481d8b8 100644
--- a/media/audio/mock_audio_manager.cc
+++ b/media/audio/mock_audio_manager.cc
@@ -32,7 +32,7 @@ MockAudioManager::~MockAudioManager() {
bool MockAudioManager::HasAudioOutputDevices() {
DCHECK(GetTaskRunner()->BelongsToCurrentThread());
- return true;
+ return has_output_devices_;
}
bool MockAudioManager::HasAudioInputDevices() {
@@ -90,13 +90,13 @@ void MockAudioManager::RemoveOutputDeviceChangeListener(
}
AudioParameters MockAudioManager::GetDefaultOutputStreamParameters() {
- return AudioParameters();
+ return default_output_params_;
}
AudioParameters MockAudioManager::GetOutputStreamParameters(
const std::string& device_id) {
DCHECK(GetTaskRunner()->BelongsToCurrentThread());
- return AudioParameters();
+ return output_params_;
}
AudioParameters MockAudioManager::GetInputStreamParameters(
@@ -120,13 +120,26 @@ const char* MockAudioManager::GetName() {
return nullptr;
}
-void MockAudioManager::SetInputStreamParameters(
- const AudioParameters& input_params) {
- input_params_ = input_params;
+void MockAudioManager::SetInputStreamParameters(const AudioParameters& params) {
+ input_params_ = params;
+}
+
+void MockAudioManager::SetOutputStreamParameters(
+ const AudioParameters& params) {
+ output_params_ = params;
+}
+
+void MockAudioManager::SetDefaultOutputStreamParameters(
+ const AudioParameters& params) {
+ default_output_params_ = params;
}
void MockAudioManager::SetHasInputDevices(bool has_input_devices) {
has_input_devices_ = has_input_devices;
}
+void MockAudioManager::SetHasOutputDevices(bool has_output_devices) {
+ has_output_devices_ = has_output_devices;
+}
+
} // namespace media.
« media/audio/audio_system_impl.cc ('K') | « media/audio/mock_audio_manager.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698