summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authordalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-30 08:41:39 +0000
committerdalecurtis@chromium.org <dalecurtis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-04-30 08:41:39 +0000
commitcff098133c170415ae633cf9633416d524dd9076 (patch)
treee295b969a9c7f6d3cab2a20068c274dd24ee65be /media
parent9d402bcaca0b2a1ddd2d5960230362550e797c21 (diff)
downloadchromium_src-cff098133c170415ae633cf9633416d524dd9076.zip
chromium_src-cff098133c170415ae633cf9633416d524dd9076.tar.gz
chromium_src-cff098133c170415ae633cf9633416d524dd9076.tar.bz2
Remove erroneous DCHECK() for deferred audio stream start.
CancellableCallbacks which have fired do not have a cancelled state. BUG=368157 TEST=none Review URL: https://codereview.chromium.org/257193004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267138 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/audio/mac/audio_auhal_mac.cc1
-rw-r--r--media/audio/mac/audio_input_mac.cc1
-rw-r--r--media/audio/mac/audio_low_latency_input_mac.cc1
3 files changed, 0 insertions, 3 deletions
diff --git a/media/audio/mac/audio_auhal_mac.cc b/media/audio/mac/audio_auhal_mac.cc
index 0c9fa0d..0e13ab5 100644
--- a/media/audio/mac/audio_auhal_mac.cc
+++ b/media/audio/mac/audio_auhal_mac.cc
@@ -155,7 +155,6 @@ void AUHALStream::Start(AudioSourceCallback* callback) {
if (manager_->ShouldDeferStreamStart()) {
// Use a cancellable closure so that if Stop() is called before Start()
// actually runs, we can cancel the pending start.
- DCHECK(deferred_start_cb_.IsCancelled());
deferred_start_cb_.Reset(
base::Bind(&AUHALStream::Start, base::Unretained(this), callback));
manager_->GetTaskRunner()->PostDelayedTask(
diff --git a/media/audio/mac/audio_input_mac.cc b/media/audio/mac/audio_input_mac.cc
index aeeac43..94dc944 100644
--- a/media/audio/mac/audio_input_mac.cc
+++ b/media/audio/mac/audio_input_mac.cc
@@ -69,7 +69,6 @@ void PCMQueueInAudioInputStream::Start(AudioInputCallback* callback) {
if (manager_->ShouldDeferStreamStart()) {
// Use a cancellable closure so that if Stop() is called before Start()
// actually runs, we can cancel the pending start.
- DCHECK(deferred_start_cb_.IsCancelled());
deferred_start_cb_.Reset(base::Bind(
&PCMQueueInAudioInputStream::Start, base::Unretained(this), callback));
manager_->GetTaskRunner()->PostDelayedTask(
diff --git a/media/audio/mac/audio_low_latency_input_mac.cc b/media/audio/mac/audio_low_latency_input_mac.cc
index e7d1a1b..bf93358 100644
--- a/media/audio/mac/audio_low_latency_input_mac.cc
+++ b/media/audio/mac/audio_low_latency_input_mac.cc
@@ -291,7 +291,6 @@ void AUAudioInputStream::Start(AudioInputCallback* callback) {
if (manager_->ShouldDeferStreamStart()) {
// Use a cancellable closure so that if Stop() is called before Start()
// actually runs, we can cancel the pending start.
- DCHECK(deferred_start_cb_.IsCancelled());
deferred_start_cb_.Reset(base::Bind(
&AUAudioInputStream::Start, base::Unretained(this), callback));
manager_->GetTaskRunner()->PostDelayedTask(