| Index: media/audio/mock_audio_manager.cc
|
| diff --git a/media/audio/mock_audio_manager.cc b/media/audio/mock_audio_manager.cc
|
| index 2fbc2859c8e35ea15d76637ad16c3590394a041b..6d1584595bbfd63801633d2961a685d090dc4038 100644
|
| --- a/media/audio/mock_audio_manager.cc
|
| +++ b/media/audio/mock_audio_manager.cc
|
| @@ -32,15 +32,11 @@ base::string16 MockAudioManager::GetAudioInputDeviceModel() {
|
| void MockAudioManager::ShowAudioInputSettings() {
|
| }
|
|
|
| -void MockAudioManager::GetAudioInputDeviceNames(
|
| - AudioDeviceNames* device_names) {
|
| - // Do not inject fake devices here, use
|
| - // AudioInputDeviceManager::GetFakeDeviceNames() instead.
|
| -}
|
| +void MockAudioManager::GetAudioInputDeviceDescriptions(
|
| + AudioDeviceDescriptions* device_descriptions) {}
|
|
|
| -void MockAudioManager::GetAudioOutputDeviceNames(
|
| - AudioDeviceNames* device_names) {
|
| -}
|
| +void MockAudioManager::GetAudioOutputDeviceDescriptions(
|
| + AudioDeviceDescriptions* device_descriptions) {}
|
|
|
| media::AudioOutputStream* MockAudioManager::MakeAudioOutputStream(
|
| const media::AudioParameters& params,
|
| @@ -92,14 +88,6 @@ std::string MockAudioManager::GetAssociatedOutputDeviceID(
|
| return std::string();
|
| }
|
|
|
| -std::string MockAudioManager::GetGroupIDOutput(const std::string& output_id) {
|
| - return "";
|
| -}
|
| -
|
| -std::string MockAudioManager::GetGroupIDInput(const std::string& input_id) {
|
| - return "";
|
| -}
|
| -
|
| std::unique_ptr<AudioLog> MockAudioManager::CreateAudioLog(
|
| AudioLogFactory::AudioComponent component) {
|
| return nullptr;
|
|
|