Enable the webrtc audio tests on the build bots that have audio hardware.

BUG=none
TEST=This enables the audio tests in content_unittests on bots with audio hardware.

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=130019

Review URL: https://chromiumcodereview.appspot.com/9921035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131757 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 13 deletions

diff --git a/content/renderer/media/webrtc_audio_device_unittest.cc b/content/renderer/media/webrtc_audio_device_unittest.cc
index e9323f2..cf3a453 100644
--- a/content/renderer/media/webrtc_audio_device_unittest.cc
+++ b/content/renderer/media/webrtc_audio_device_unittest.cc
@@ -75,13 +75,6 @@ class AudioUtilNoHardware : public AudioUtilInterface {
   DISALLOW_COPY_AND_ASSIGN(AudioUtilNoHardware);
 };
 
-bool IsRunningHeadless() {
-  scoped_ptr<base::Environment> env(base::Environment::Create());
-  if (env->HasVar("CHROME_HEADLESS"))
-    return true;
-  return false;
-}
-
 // Return true if at least one element in the array matches |value|.
 bool FindElementInArray(int* array, int size, int value) {
   return (std::find(&array[0], &array[0] + size, value) != &array[size]);
@@ -106,7 +99,7 @@ bool HardwareSampleRatesAreValid() {
 
   if (!FindElementInArray(valid_input_rates, arraysize(valid_input_rates),
                           input_sample_rate)) {
-    DLOG(WARNING) << "Non-supported input sample rate detected.";
+    LOG(WARNING) << "Non-supported input sample rate detected.";
     return false;
   }
 
@@ -115,7 +108,7 @@ bool HardwareSampleRatesAreValid() {
       static_cast<int>(audio_hardware::GetOutputSampleRate());
   if (!FindElementInArray(valid_output_rates, arraysize(valid_output_rates),
                           output_sample_rate)) {
-    DLOG(WARNING) << "Non-supported output sample rate detected.";
+    LOG(WARNING) << "Non-supported output sample rate detected.";
     return false;
   }
 
@@ -260,8 +253,10 @@ TEST_F(WebRTCAudioDeviceTest, Construct) {
 // verify that streaming starts correctly.
 // Disabled when running headless since the bots don't have the required config.
 TEST_F(WebRTCAudioDeviceTest, StartPlayout) {
-  if (IsRunningHeadless())
+  if (!has_output_devices_) {
+    LOG(WARNING) << "No output device detected.";
     return;
+  }
 
   AudioUtil audio_util;
   SetAudioUtilCallback(&audio_util);
@@ -332,8 +327,10 @@ TEST_F(WebRTCAudioDeviceTest, StartPlayout) {
 // that the audio capturing starts as it should.
 // Disabled when running headless since the bots don't have the required config.
 TEST_F(WebRTCAudioDeviceTest, StartRecording) {
-  if (IsRunningHeadless())
+  if (!has_input_devices_ || !has_output_devices_) {
+    LOG(WARNING) << "Missing audio devices.";
     return;
+  }
 
   AudioUtil audio_util;
   SetAudioUtilCallback(&audio_util);
@@ -399,8 +396,10 @@ TEST_F(WebRTCAudioDeviceTest, StartRecording) {
 // Uses WebRtcAudioDeviceImpl to play a local wave file.
 // Disabled when running headless since the bots don't have the required config.
 TEST_F(WebRTCAudioDeviceTest, PlayLocalFile) {
-  if (IsRunningHeadless())
+  if (!has_output_devices_) {
+    LOG(WARNING) << "No output device detected.";
     return;
+  }
 
   std::string file_path(
       GetTestDataPath(FILE_PATH_LITERAL("speechmusic_mono_16kHz.pcm")));
@@ -468,8 +467,10 @@ TEST_F(WebRTCAudioDeviceTest, PlayLocalFile) {
 // TODO(henrika): improve quality by using a wideband codec, enabling noise-
 // suppressions etc.
 TEST_F(WebRTCAudioDeviceTest, FullDuplexAudioWithAGC) {
-  if (IsRunningHeadless())
+  if (!has_output_devices_ || !has_input_devices_) {
+    LOG(WARNING) << "Missing audio devices.";
     return;
+  }
 
   AudioUtil audio_util;
   SetAudioUtilCallback(&audio_util);