Index: media/audio/audio_manager_unittest.cc |
diff --git a/media/audio/audio_manager_unittest.cc b/media/audio/audio_manager_unittest.cc |
index 48bb51cee5c83f15b6909a4988e2f67c173e1209..0b6cee85d7b672a1683d75537f47930acca00403 100644 |
--- a/media/audio/audio_manager_unittest.cc |
+++ b/media/audio/audio_manager_unittest.cc |
@@ -75,14 +75,13 @@ class AudioManagerTest : public ::testing::Test { |
// Helper method which verifies that the device list starts with a valid |
// default record followed by non-default device names. |
- static void CheckDeviceNames(const AudioDeviceNames& device_names) { |
+ void CheckDeviceNames(const AudioDeviceNames& device_names) { |
DVLOG(2) << "Got " << device_names.size() << " audio devices."; |
if (!device_names.empty()) { |
AudioDeviceNames::const_iterator it = device_names.begin(); |
// The first device in the list should always be the default device. |
- EXPECT_EQ(std::string(AudioManagerBase::kDefaultDeviceName), |
- it->device_name); |
+ EXPECT_EQ(audio_manager_->GetDefaultDeviceName(), it->device_name); |
EXPECT_EQ(std::string(AudioManagerBase::kDefaultDeviceId), it->unique_id); |
++it; |
@@ -93,8 +92,7 @@ class AudioManagerTest : public ::testing::Test { |
EXPECT_FALSE(it->unique_id.empty()); |
DVLOG(2) << "Device ID(" << it->unique_id |
<< "), label: " << it->device_name; |
- EXPECT_NE(std::string(AudioManagerBase::kDefaultDeviceName), |
- it->device_name); |
+ EXPECT_NE(audio_manager_->GetDefaultDeviceName(), it->device_name); |
EXPECT_NE(std::string(AudioManagerBase::kDefaultDeviceId), |
it->unique_id); |
++it; |