| Index: media/audio/audio_output_resampler.cc
|
| diff --git a/media/audio/audio_output_resampler.cc b/media/audio/audio_output_resampler.cc
|
| index 30f4ec12cdca4efa8719acc9094eb5d2081c587d..1408be2d2205ec9b29867cb14bb5d76866defff1 100644
|
| --- a/media/audio/audio_output_resampler.cc
|
| +++ b/media/audio/audio_output_resampler.cc
|
| @@ -7,8 +7,8 @@
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| #include "base/compiler_specific.h"
|
| -#include "base/message_loop/message_loop.h"
|
| #include "base/metrics/histogram.h"
|
| +#include "base/single_thread_task_runner.h"
|
| #include "base/time/time.h"
|
| #include "build/build_config.h"
|
| #include "media/audio/audio_io.h"
|
| @@ -175,7 +175,7 @@ void AudioOutputResampler::Initialize() {
|
| }
|
|
|
| bool AudioOutputResampler::OpenStream() {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
|
|
| if (dispatcher_->OpenStream()) {
|
| // Only record the UMA statistic if we didn't fallback during construction
|
| @@ -235,7 +235,7 @@ bool AudioOutputResampler::OpenStream() {
|
| bool AudioOutputResampler::StartStream(
|
| AudioOutputStream::AudioSourceCallback* callback,
|
| AudioOutputProxy* stream_proxy) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
|
|
| OnMoreDataConverter* resampler_callback = NULL;
|
| CallbackMap::iterator it = callbacks_.find(stream_proxy);
|
| @@ -255,12 +255,12 @@ bool AudioOutputResampler::StartStream(
|
|
|
| void AudioOutputResampler::StreamVolumeSet(AudioOutputProxy* stream_proxy,
|
| double volume) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| dispatcher_->StreamVolumeSet(stream_proxy, volume);
|
| }
|
|
|
| void AudioOutputResampler::StopStream(AudioOutputProxy* stream_proxy) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| dispatcher_->StopStream(stream_proxy);
|
|
|
| // Now that StopStream() has completed the underlying physical stream should
|
| @@ -272,7 +272,7 @@ void AudioOutputResampler::StopStream(AudioOutputProxy* stream_proxy) {
|
| }
|
|
|
| void AudioOutputResampler::CloseStream(AudioOutputProxy* stream_proxy) {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
| dispatcher_->CloseStream(stream_proxy);
|
|
|
| // We assume that StopStream() is always called prior to CloseStream(), so
|
| @@ -285,7 +285,7 @@ void AudioOutputResampler::CloseStream(AudioOutputProxy* stream_proxy) {
|
| }
|
|
|
| void AudioOutputResampler::Shutdown() {
|
| - DCHECK(message_loop_->BelongsToCurrentThread());
|
| + DCHECK(task_runner_->BelongsToCurrentThread());
|
|
|
| // No AudioOutputProxy objects should hold a reference to us when we get
|
| // to this stage.
|
|
|