Chromium Code Reviews| Index: media/audio/audio_input_volume_unittest.cc |
| diff --git a/media/audio/audio_input_volume_unittest.cc b/media/audio/audio_input_volume_unittest.cc |
| index a2213a3e92be7306f5d76a4c1aebdceb397f15ac..f8dcf8b1c7d0a195ee620c6f60f17e15b5768212 100644 |
| --- a/media/audio/audio_input_volume_unittest.cc |
| +++ b/media/audio/audio_input_volume_unittest.cc |
| @@ -8,6 +8,7 @@ |
| #include "base/memory/scoped_ptr.h" |
| #include "media/audio/audio_io.h" |
| #include "media/audio/audio_manager_base.h" |
| +#include "media/audio/audio_unittest_utils.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| #if defined(OS_WIN) |
| @@ -48,14 +49,9 @@ class AudioInputVolumeTest : public ::testing::Test { |
| bool CanRunAudioTests() { |
|
DaleCurtis
2015/02/09 21:21:31
HasCoreAudioAndInputDevices ?
watk
2015/02/09 22:03:57
Done.
|
| #if defined(OS_WIN) |
| // TODO(henrika): add support for volume control on Windows XP as well. |
| - // For now, we might as well signal false already here to avoid running |
| - // these tests on Windows XP. |
| - if (!CoreAudioUtil::IsSupported()) |
| + if (!CoreAudioUtils::IsSupported()) |
| return false; |
| #endif |
| - if (!audio_manager_) |
| - return false; |
| - |
| return audio_manager_->HasAudioInputDevices(); |
| } |
| @@ -106,8 +102,7 @@ class AudioInputVolumeTest : public ::testing::Test { |
| #endif |
| TEST_F(AudioInputVolumeTest, MAYBE_InputVolumeTest) { |
| - if (!CanRunAudioTests()) |
| - return; |
| + CAN_RUN_AUDIO_TEST_IF(CanRunAudioTests()); |
| // Retrieve a list of all available input devices. |
| AudioDeviceNames device_names; |