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

Unified Diff: media/audio/audio_manager_unittest.cc

Issue 2150983003: Fix audio_manager_unittest should update with AudioDevice display_name (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_manager_unittest.cc
diff --git a/media/audio/audio_manager_unittest.cc b/media/audio/audio_manager_unittest.cc
index 27c51446ef80830d4f1fe50144dbcf521d05a6e7..b878861d54d6ce66d605e2eef9a85e9186abf52e 100644
--- a/media/audio/audio_manager_unittest.cc
+++ b/media/audio/audio_manager_unittest.cc
@@ -379,9 +379,12 @@ TEST_F(AudioManagerTest, EnumerateInputDevicesCras) {
// Setup expectation with physical devices.
std::map<uint64_t, std::string> expectation;
- expectation[kJabraMic1.id] = kJabraMic1.device_name;
- expectation[kJabraMic2.id] = kJabraMic2.device_name;
- expectation[kUSBCameraMic.id] = kUSBCameraMic.device_name;
+ expectation[kJabraMic1.id] =
+ cras_audio_handler_->GetDeviceFromId(kJabraMic1.id)->display_name;
+ expectation[kJabraMic2.id] =
+ cras_audio_handler_->GetDeviceFromId(kJabraMic2.id)->display_name;
+ expectation[kUSBCameraMic.id] =
+ cras_audio_handler_->GetDeviceFromId(kUSBCameraMic.id)->display_name;
DVLOG(2) << "Testing AudioManagerCras.";
CreateAudioManagerForTesting<AudioManagerCras>();
@@ -405,8 +408,10 @@ TEST_F(AudioManagerTest, EnumerateOutputDevicesCras) {
// Setup expectation with physical devices.
std::map<uint64_t, std::string> expectation;
- expectation[kHDMIOutput.id] = kHDMIOutput.device_name;
- expectation[kJabraSpeaker1.id] = kJabraSpeaker1.device_name;
+ expectation[kHDMIOutput.id] =
+ cras_audio_handler_->GetDeviceFromId(kHDMIOutput.id)->display_name;
+ expectation[kJabraSpeaker1.id] =
+ cras_audio_handler_->GetDeviceFromId(kJabraSpeaker1.id)->display_name;
DVLOG(2) << "Testing AudioManagerCras.";
CreateAudioManagerForTesting<AudioManagerCras>();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698