| Index: media/audio/sounds/audio_stream_handler.cc
|
| diff --git a/media/audio/sounds/audio_stream_handler.cc b/media/audio/sounds/audio_stream_handler.cc
|
| index 141392c1c3c1a7debec8c74d7f65717bc6de8f4f..9d3bd2d6863e86b97ace5d4b09f4150414f3ca94 100644
|
| --- a/media/audio/sounds/audio_stream_handler.cc
|
| +++ b/media/audio/sounds/audio_stream_handler.cc
|
| @@ -7,7 +7,7 @@
|
| #include <string>
|
|
|
| #include "base/logging.h"
|
| -#include "base/message_loop/message_loop_proxy.h"
|
| +#include "base/single_thread_task_runner.h"
|
| #include "media/audio/audio_manager.h"
|
| #include "media/audio/audio_manager_base.h"
|
| #include "media/base/channel_layout.h"
|
| @@ -36,11 +36,11 @@ class AudioStreamHandler::AudioStreamContainer
|
| }
|
|
|
| virtual ~AudioStreamContainer() {
|
| - DCHECK(AudioManager::Get()->GetMessageLoop()->BelongsToCurrentThread());
|
| + DCHECK(AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread());
|
| }
|
|
|
| void Play() {
|
| - DCHECK(AudioManager::Get()->GetMessageLoop()->BelongsToCurrentThread());
|
| + DCHECK(AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread());
|
|
|
| if (!stream_) {
|
| stream_ = AudioManager::Get()->MakeAudioOutputStreamProxy(params_,
|
| @@ -67,7 +67,7 @@ class AudioStreamHandler::AudioStreamContainer
|
| }
|
|
|
| void Stop() {
|
| - DCHECK(AudioManager::Get()->GetMessageLoop()->BelongsToCurrentThread());
|
| + DCHECK(AudioManager::Get()->GetTaskRunner()->BelongsToCurrentThread());
|
| if (!stream_)
|
| return;
|
| stream_->Stop();
|
| @@ -86,7 +86,7 @@ class AudioStreamHandler::AudioStreamContainer
|
| size_t bytes_written = 0;
|
| if (wav_audio_.AtEnd(cursor_) ||
|
| !wav_audio_.CopyTo(dest, cursor_, &bytes_written)) {
|
| - AudioManager::Get()->GetMessageLoop()->PostTask(
|
| + AudioManager::Get()->GetTaskRunner()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&AudioStreamContainer::Stop, base::Unretained(this)));
|
| return 0;
|
| @@ -140,10 +140,10 @@ AudioStreamHandler::AudioStreamHandler(const base::StringPiece& wav_data)
|
|
|
| AudioStreamHandler::~AudioStreamHandler() {
|
| DCHECK(CalledOnValidThread());
|
| - AudioManager::Get()->GetMessageLoop()->PostTask(
|
| + AudioManager::Get()->GetTaskRunner()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&AudioStreamContainer::Stop, base::Unretained(stream_.get())));
|
| - AudioManager::Get()->GetMessageLoop()->DeleteSoon(FROM_HERE,
|
| + AudioManager::Get()->GetTaskRunner()->DeleteSoon(FROM_HERE,
|
| stream_.release());
|
| }
|
|
|
| @@ -158,7 +158,7 @@ bool AudioStreamHandler::Play() {
|
| if (!IsInitialized())
|
| return false;
|
|
|
| - AudioManager::Get()->GetMessageLoop()->PostTask(
|
| + AudioManager::Get()->GetTaskRunner()->PostTask(
|
| FROM_HERE,
|
| base::Bind(base::IgnoreResult(&AudioStreamContainer::Play),
|
| base::Unretained(stream_.get())));
|
| @@ -167,7 +167,7 @@ bool AudioStreamHandler::Play() {
|
|
|
| void AudioStreamHandler::Stop() {
|
| DCHECK(CalledOnValidThread());
|
| - AudioManager::Get()->GetMessageLoop()->PostTask(
|
| + AudioManager::Get()->GetTaskRunner()->PostTask(
|
| FROM_HERE,
|
| base::Bind(&AudioStreamContainer::Stop, base::Unretained(stream_.get())));
|
| }
|
|
|