| Index: media/audio/virtual_audio_input_stream_unittest.cc
|
| diff --git a/media/audio/virtual_audio_input_stream_unittest.cc b/media/audio/virtual_audio_input_stream_unittest.cc
|
| index aab67cca5719a15a63db2db7d47eed6e81d7285d..3731c8052b6a56bc03c9420c0b9ba3bceea22029 100644
|
| --- a/media/audio/virtual_audio_input_stream_unittest.cc
|
| +++ b/media/audio/virtual_audio_input_stream_unittest.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| -#include "base/message_loop/message_loop.h"
|
| #include "base/rand_util.h"
|
| #include "base/synchronization/waitable_event.h"
|
| #include "base/threading/thread.h"
|
| @@ -105,7 +104,7 @@ class VirtualAudioInputStreamTest : public testing::TestWithParam<bool> {
|
| stream_(NULL),
|
| closed_stream_(false, false) {
|
| audio_thread_->Start();
|
| - audio_message_loop_ = audio_thread_->message_loop_proxy();
|
| + audio_task_runner_ = audio_thread_->message_loop_proxy();
|
| }
|
|
|
| virtual ~VirtualAudioInputStreamTest() {
|
| @@ -118,7 +117,7 @@ class VirtualAudioInputStreamTest : public testing::TestWithParam<bool> {
|
| void Create() {
|
| const bool worker_is_separate_thread = GetParam();
|
| stream_ = new VirtualAudioInputStream(
|
| - kParams, GetWorkerLoop(worker_is_separate_thread),
|
| + kParams, GetWorkerTaskRunner(worker_is_separate_thread),
|
| base::Bind(&base::DeletePointer<VirtualAudioInputStream>));
|
| stream_->Open();
|
| }
|
| @@ -209,36 +208,36 @@ class VirtualAudioInputStreamTest : public testing::TestWithParam<bool> {
|
| stopped_output_streams_.clear();
|
| }
|
|
|
| - const scoped_refptr<base::MessageLoopProxy>& audio_message_loop() const {
|
| - return audio_message_loop_;
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& audio_task_runner() const {
|
| + return audio_task_runner_;
|
| }
|
|
|
| - const scoped_refptr<base::MessageLoopProxy>& GetWorkerLoop(
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& GetWorkerTaskRunner(
|
| bool worker_is_separate_thread) {
|
| if (worker_is_separate_thread) {
|
| if (!worker_thread_->IsRunning()) {
|
| worker_thread_->Start();
|
| - worker_message_loop_ = worker_thread_->message_loop_proxy();
|
| + worker_task_runner_ = worker_thread_->message_loop_proxy();
|
| }
|
| - return worker_message_loop_;
|
| + return worker_task_runner_;
|
| } else {
|
| - return audio_message_loop_;
|
| + return audio_task_runner_;
|
| }
|
| }
|
|
|
| private:
|
| void SyncWithAudioThread() {
|
| base::WaitableEvent done(false, false);
|
| - audio_message_loop_->PostTask(
|
| + audio_task_runner_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&base::WaitableEvent::Signal, base::Unretained(&done)));
|
| done.Wait();
|
| }
|
|
|
| scoped_ptr<base::Thread> audio_thread_;
|
| - scoped_refptr<base::MessageLoopProxy> audio_message_loop_;
|
| + scoped_refptr<base::SingleThreadTaskRunner> audio_task_runner_;
|
| scoped_ptr<base::Thread> worker_thread_;
|
| - scoped_refptr<base::MessageLoopProxy> worker_message_loop_;
|
| + scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner_;
|
|
|
| VirtualAudioInputStream* stream_;
|
| MockInputCallback input_callback_;
|
| @@ -252,7 +251,7 @@ class VirtualAudioInputStreamTest : public testing::TestWithParam<bool> {
|
| };
|
|
|
| #define RUN_ON_AUDIO_THREAD(method) \
|
| - audio_message_loop()->PostTask( \
|
| + audio_task_runner()->PostTask( \
|
| FROM_HERE, base::Bind(&VirtualAudioInputStreamTest::method, \
|
| base::Unretained(this)))
|
|
|
|
|