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

Unified Diff: media/audio/audio_output_controller.cc

Issue 9858007: Fix a couple of regressions that made it in before the weekend. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix media tests Created 8 years, 9 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
« no previous file with comments | « media/audio/audio_output_controller.h ('k') | media/audio/audio_output_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_controller.cc
diff --git a/media/audio/audio_output_controller.cc b/media/audio/audio_output_controller.cc
index 0291c382d9da8f6753da6c0859ba331d21311915..f5646f28c2acf8ffb237e5c9ba456e1154fe2509 100644
--- a/media/audio/audio_output_controller.cc
+++ b/media/audio/audio_output_controller.cc
@@ -96,8 +96,8 @@ void AudioOutputController::Flush() {
void AudioOutputController::Close(const base::Closure& closed_task) {
DCHECK(!closed_task.is_null());
DCHECK(message_loop_);
- message_loop_->PostTask(FROM_HERE, base::Bind(
- &AudioOutputController::DoClose, base::Unretained(this), closed_task));
+ message_loop_->PostTaskAndReply(FROM_HERE, base::Bind(
+ &AudioOutputController::DoClose, base::Unretained(this)), closed_task);
}
void AudioOutputController::SetVolume(double volume) {
@@ -240,7 +240,7 @@ void AudioOutputController::DoFlush() {
// TODO(hclam): Actually flush the audio device.
}
-void AudioOutputController::DoClose(const base::Closure& closed_task) {
+void AudioOutputController::DoClose() {
DCHECK(message_loop_->BelongsToCurrentThread());
if (state_ != kClosed) {
@@ -248,8 +248,6 @@ void AudioOutputController::DoClose(const base::Closure& closed_task) {
sync_reader_->Close();
state_ = kClosed;
}
-
- closed_task.Run();
}
void AudioOutputController::DoSetVolume(double volume) {
« no previous file with comments | « media/audio/audio_output_controller.h ('k') | media/audio/audio_output_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698