Index: media/audio/audio_output_controller.cc |
=================================================================== |
--- media/audio/audio_output_controller.cc (revision 134713) |
+++ media/audio/audio_output_controller.cc (working copy) |
@@ -49,7 +49,7 @@ |
false /* initial state */); |
message_loop_->PostTask(FROM_HERE, |
base::Bind(&AudioOutputController::DoStopCloseAndClearStream, |
- base::Unretained(this), |
+ this, |
tommi (sloooow) - chröme
2012/05/02 07:56:18
I don't think it's a good idea to do this in this
|
&completion)); |
completion.Wait(); |
} |
@@ -81,32 +81,32 @@ |
void AudioOutputController::Play() { |
DCHECK(message_loop_); |
message_loop_->PostTask(FROM_HERE, base::Bind( |
- &AudioOutputController::DoPlay, base::Unretained(this))); |
+ &AudioOutputController::DoPlay, this)); |
tommi (sloooow) - chröme
2012/05/02 07:56:18
The original reason for using Unretained() here wa
|
} |
void AudioOutputController::Pause() { |
DCHECK(message_loop_); |
message_loop_->PostTask(FROM_HERE, base::Bind( |
- &AudioOutputController::DoPause, base::Unretained(this))); |
+ &AudioOutputController::DoPause, this)); |
} |
void AudioOutputController::Flush() { |
DCHECK(message_loop_); |
message_loop_->PostTask(FROM_HERE, base::Bind( |
- &AudioOutputController::DoFlush, base::Unretained(this))); |
+ &AudioOutputController::DoFlush, this)); |
} |
void AudioOutputController::Close(const base::Closure& closed_task) { |
DCHECK(!closed_task.is_null()); |
DCHECK(message_loop_); |
message_loop_->PostTaskAndReply(FROM_HERE, base::Bind( |
- &AudioOutputController::DoClose, base::Unretained(this)), closed_task); |
+ &AudioOutputController::DoClose, this), closed_task); |
} |
void AudioOutputController::SetVolume(double volume) { |
DCHECK(message_loop_); |
message_loop_->PostTask(FROM_HERE, base::Bind( |
- &AudioOutputController::DoSetVolume, base::Unretained(this), volume)); |
+ &AudioOutputController::DoSetVolume, this, volume)); |
} |
void AudioOutputController::DoCreate(AudioManager* audio_manager, |
@@ -314,7 +314,7 @@ |
void AudioOutputController::OnError(AudioOutputStream* stream, int code) { |
// Handle error on the audio controller thread. |
message_loop_->PostTask(FROM_HERE, base::Bind( |
- &AudioOutputController::DoReportError, base::Unretained(this), code)); |
+ &AudioOutputController::DoReportError, this, code)); |
} |
void AudioOutputController::DoStopCloseAndClearStream(WaitableEvent *done) { |