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

Unified Diff: media/audio/virtual_audio_input_stream_unittest.cc

Issue 66183002: Replace MessageLoopProxy with SingleThreadTaskRunner for the rest of media/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix win and audio tests Created 6 years, 11 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/virtual_audio_input_stream.cc ('k') | media/audio/virtual_audio_output_stream_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 8c792d5b89efab0d709e31f20e6ab72fd9c7495e..49379524cfd0f0b21a424fb4935fdeb498873b7c 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"
@@ -104,7 +103,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() {
@@ -117,7 +116,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();
}
@@ -207,36 +206,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_;
@@ -250,7 +249,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)))
« no previous file with comments | « media/audio/virtual_audio_input_stream.cc ('k') | media/audio/virtual_audio_output_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698