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

Unified Diff: media/audio/android/audio_android_unittest.cc

Issue 914483002: Add flag --require-audio-hardware-for-testing. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
Index: media/audio/android/audio_android_unittest.cc
diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
index 1da84cacb583c106b3a5b9ff96793a97f7f92b9f..2b41ff67074a88c16f8c15cb83643493a23b4050 100644
--- a/media/audio/android/audio_android_unittest.cc
+++ b/media/audio/android/audio_android_unittest.cc
@@ -19,6 +19,7 @@
#include "media/audio/android/audio_manager_android.h"
#include "media/audio/audio_io.h"
#include "media/audio/audio_manager_base.h"
+#include "media/audio/audio_unittest_utils.h"
#include "media/audio/mock_audio_source_callback.h"
#include "media/base/decoder_buffer.h"
#include "media/base/seekable_buffer.h"
@@ -733,8 +734,7 @@ TEST_F(AudioAndroidOutputTest, GetDefaultOutputStreamParameters) {
// Verify input device enumeration.
TEST_F(AudioAndroidInputTest, GetAudioInputDeviceNames) {
- if (!audio_manager()->HasAudioInputDevices())
- return;
+ ABORT_AUDIO_TEST_IF_NOT(audio_manager()->HasAudioInputDevices());
AudioDeviceNames devices;
RunOnAudioThread(
base::Bind(&AudioManager::GetAudioInputDeviceNames,
@@ -745,8 +745,7 @@ TEST_F(AudioAndroidInputTest, GetAudioInputDeviceNames) {
// Verify output device enumeration.
TEST_F(AudioAndroidOutputTest, GetAudioOutputDeviceNames) {
- if (!audio_manager()->HasAudioOutputDevices())
- return;
+ ABORT_AUDIO_TEST_IF_NOT(audio_manager()->HasAudioOutputDevices());
AudioDeviceNames devices;
RunOnAudioThread(
base::Bind(&AudioManager::GetAudioOutputDeviceNames,
« no previous file with comments | « no previous file | media/audio/audio_input_unittest.cc » ('j') | media/audio/audio_low_latency_input_output_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698