Fix audio_manager_unittest should update with AudioDevice display_name

media/audio/audio_manager_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/audio_manager.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/environment.h"
@@ skipping 361 matching lines @@
   audio_nodes.push_back(kJabraMic2);
   audio_nodes.push_back(kUSBCameraMic);
   audio_nodes.push_back(kHDMIOutput);
   audio_nodes.push_back(kJabraSpeaker1);
   SetUpCrasAudioHandlerWithTestingNodes(audio_nodes);
 
   ABORT_AUDIO_TEST_IF_NOT(InputDevicesAvailable());
 
   // 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>();
   AudioDeviceNames device_names;
   audio_manager_->GetAudioInputDeviceNames(&device_names);
   CheckDeviceNamesCras(device_names, expectation);
 }
 
 TEST_F(AudioManagerTest, EnumerateOutputDevicesCras) {
   // Setup the devices without internal mic, so that it doesn't exist
   // beamforming capable mic.
   AudioNodeList audio_nodes;
   audio_nodes.push_back(kJabraMic1);
   audio_nodes.push_back(kJabraMic2);
   audio_nodes.push_back(kUSBCameraMic);
   audio_nodes.push_back(kHDMIOutput);
   audio_nodes.push_back(kJabraSpeaker1);
   SetUpCrasAudioHandlerWithTestingNodes(audio_nodes);
 
   ABORT_AUDIO_TEST_IF_NOT(OutputDevicesAvailable());
 
   // 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>();
   AudioDeviceNames device_names;
   audio_manager_->GetAudioOutputDeviceNames(&device_names);
   CheckDeviceNamesCras(device_names, expectation);
 }
 #else  // !defined(USE_CRAS)
 
 TEST_F(AudioManagerTest, HandleDefaultDeviceIDs) {
@@ skipping 209 matching lines @@
       found_an_associated_device = true;
     }
   }
 
   EXPECT_TRUE(found_an_associated_device);
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 }
 #endif  // defined(USE_CRAS)
 
 }  // namespace media