summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhenrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-31 16:48:59 +0000
committerhenrika@chromium.org <henrika@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-31 16:48:59 +0000
commitb5f97555dca087b39f9f22b9d85c15713f83b102 (patch)
tree41c36f72c6b4400e587c3ecf55bc20aa29b5ee20
parent1fb07ac8b7aa44fced9435cc47a18baf6f8245e0 (diff)
downloadchromium_src-b5f97555dca087b39f9f22b9d85c15713f83b102.zip
chromium_src-b5f97555dca087b39f9f22b9d85c15713f83b102.tar.gz
chromium_src-b5f97555dca087b39f9f22b9d85c15713f83b102.tar.bz2
Disables the check for no data timer for audio on all platforms.
BUG=357569 NOTRY=true Review URL: https://codereview.chromium.org/219023003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260570 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--media/audio/audio_input_controller.cc8
-rw-r--r--media/audio/audio_input_controller_unittest.cc11
2 files changed, 9 insertions, 10 deletions
diff --git a/media/audio/audio_input_controller.cc b/media/audio/audio_input_controller.cc
index ef2c4a9..6a62b6d 100644
--- a/media/audio/audio_input_controller.cc
+++ b/media/audio/audio_input_controller.cc
@@ -202,11 +202,15 @@ void AudioInputController::DoCreateForStream(
DCHECK(!no_data_timer_.get());
-#if defined(OS_MACOSX)
// This is a fix for crbug.com/357501. The timer can trigger when closing
// the lid on Macs, which causes more problems than the timer fixes.
+ // Also, in crbug.com/357569, the goal is to remove usage of this timer
+ // since it was added to solve a crash on Windows that no longer can be
+ // reproduced.
+ // TODO(henrika): remove usage of timer when it has been verified on Canary
+ // that we are safe doing so. Goal is to get rid of |no_data_timer_| and
+ // everything that is tied to it.
enable_nodata_timer = false;
-#endif
if (enable_nodata_timer) {
// Create the data timer which will call DoCheckForNoData(). The timer
diff --git a/media/audio/audio_input_controller_unittest.cc b/media/audio/audio_input_controller_unittest.cc
index 2673cd2..f101835 100644
--- a/media/audio/audio_input_controller_unittest.cc
+++ b/media/audio/audio_input_controller_unittest.cc
@@ -145,14 +145,9 @@ TEST_F(AudioInputControllerTest, RecordAndClose) {
// Test that the AudioInputController reports an error when the input stream
// stops. This can happen when the underlying audio layer stops feeding data as
// a result of a removed microphone device.
-#if defined(OS_MACOSX)
-// Disabled on Mac due to crbug.com/357501.
-// TODO(tommi): Remove the test when the timer workaround has been removed.
-#define MAYBE_RecordAndError DISABLED_RecordAndError
-#else
-#define MAYBE_RecordAndError RecordAndError
-#endif
-TEST_F(AudioInputControllerTest, MAYBE_RecordAndError) {
+// Disabled due to crbug.com/357569 and crbug.com/357501.
+// TODO(henrika): Remove the test when the timer workaround has been removed.
+TEST_F(AudioInputControllerTest, DISABLED_RecordAndError) {
MockAudioInputControllerEventHandler event_handler;
int count = 0;