summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-14 12:38:47 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-14 12:38:47 +0000
commited373bb1ff102c941cda58a0f01d198ff24c2dc5 (patch)
treeff3f58983111717802ad82a98021b7ba2c1b7ae0 /media
parentd4f8190b6bd0e897767e3625b675cb8c528b6824 (diff)
downloadchromium_src-ed373bb1ff102c941cda58a0f01d198ff24c2dc5.zip
chromium_src-ed373bb1ff102c941cda58a0f01d198ff24c2dc5.tar.gz
chromium_src-ed373bb1ff102c941cda58a0f01d198ff24c2dc5.tar.bz2
Enable the AudioOutputController tests on all bots.
These tests don't require audio hardware, so it should be safe to run them on the waterfall and increase our coverage. TEST=Hopefully won't break the build! Run media_unittests. Review URL: http://codereview.chromium.org/8912018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114412 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/audio/audio_output_controller_unittest.cc31
1 files changed, 0 insertions, 31 deletions
diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
index c4b0d4e..65ba2eb 100644
--- a/media/audio/audio_output_controller_unittest.cc
+++ b/media/audio/audio_output_controller_unittest.cc
@@ -61,13 +61,6 @@ class MockAudioOutputControllerSyncReader
DISALLOW_COPY_AND_ASSIGN(MockAudioOutputControllerSyncReader);
};
-static bool IsRunningHeadless() {
- scoped_ptr<base::Environment> env(base::Environment::Create());
- if (env->HasVar("CHROME_HEADLESS"))
- return true;
- return false;
-}
-
ACTION_P(SignalEvent, event) {
event->Signal();
}
@@ -85,9 +78,6 @@ static void CloseAudioController(AudioOutputController* controller) {
}
TEST(AudioOutputControllerTest, CreateAndClose) {
- if (IsRunningHeadless())
- return;
-
scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
if (!audio_manager->HasAudioOutputDevices())
return;
@@ -110,9 +100,6 @@ TEST(AudioOutputControllerTest, CreateAndClose) {
}
TEST(AudioOutputControllerTest, PlayAndClose) {
- if (IsRunningHeadless())
- return;
-
scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
if (!audio_manager->HasAudioOutputDevices())
return;
@@ -157,9 +144,6 @@ TEST(AudioOutputControllerTest, PlayAndClose) {
}
TEST(AudioOutputControllerTest, PlayAndCloseLowLatency) {
- if (IsRunningHeadless())
- return;
-
scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
if (!audio_manager->HasAudioOutputDevices())
return;
@@ -214,9 +198,6 @@ TEST(AudioOutputControllerTest, PlayAndCloseLowLatency) {
}
TEST(AudioOutputControllerTest, PlayPauseClose) {
- if (IsRunningHeadless())
- return;
-
scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
if (!audio_manager->HasAudioOutputDevices())
return;
@@ -273,9 +254,6 @@ TEST(AudioOutputControllerTest, PlayPauseClose) {
}
TEST(AudioOutputControllerTest, PlayPauseCloseLowLatency) {
- if (IsRunningHeadless())
- return;
-
scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
if (!audio_manager->HasAudioOutputDevices())
return;
@@ -323,9 +301,6 @@ TEST(AudioOutputControllerTest, PlayPauseCloseLowLatency) {
}
TEST(AudioOutputControllerTest, PlayPausePlay) {
- if (IsRunningHeadless())
- return;
-
scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
if (!audio_manager->HasAudioOutputDevices())
return;
@@ -398,9 +373,6 @@ TEST(AudioOutputControllerTest, PlayPausePlay) {
}
TEST(AudioOutputControllerTest, HardwareBufferTooLarge) {
- if (IsRunningHeadless())
- return;
-
scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
if (!audio_manager->HasAudioOutputDevices())
return;
@@ -420,9 +392,6 @@ TEST(AudioOutputControllerTest, HardwareBufferTooLarge) {
}
TEST(AudioOutputControllerTest, CloseTwice) {
- if (IsRunningHeadless())
- return;
-
scoped_refptr<AudioManager> audio_manager(AudioManager::Create());
if (!audio_manager->HasAudioOutputDevices())
return;