| Index: content/renderer/media/aec_dump_message_filter.cc
|
| diff --git a/content/renderer/media/aec_dump_message_filter.cc b/content/renderer/media/aec_dump_message_filter.cc
|
| index ed6aa4a8ee5f80d0239aba26b85bb2b17e1f44a1..3788e18df30eb3226aacbf3732e199088afba505 100644
|
| --- a/content/renderer/media/aec_dump_message_filter.cc
|
| +++ b/content/renderer/media/aec_dump_message_filter.cc
|
| @@ -4,7 +4,7 @@
|
|
|
| #include "content/renderer/media/aec_dump_message_filter.h"
|
|
|
| -#include "base/message_loop/message_loop_proxy.h"
|
| +#include "base/single_thread_task_runner.h"
|
| #include "content/common/media/aec_dump_messages.h"
|
| #include "content/renderer/media/webrtc_logging.h"
|
| #include "ipc/ipc_logging.h"
|
| @@ -19,12 +19,12 @@ namespace content {
|
| AecDumpMessageFilter* AecDumpMessageFilter::g_filter = NULL;
|
|
|
| AecDumpMessageFilter::AecDumpMessageFilter(
|
| - const scoped_refptr<base::MessageLoopProxy>& io_message_loop,
|
| - const scoped_refptr<base::MessageLoopProxy>& main_message_loop)
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner)
|
| : sender_(NULL),
|
| delegate_id_counter_(0),
|
| - io_message_loop_(io_message_loop),
|
| - main_message_loop_(main_message_loop) {
|
| + io_task_runner_(io_task_runner),
|
| + main_task_runner_(main_task_runner) {
|
| DCHECK(!g_filter);
|
| g_filter = this;
|
| }
|
| @@ -41,40 +41,34 @@ scoped_refptr<AecDumpMessageFilter> AecDumpMessageFilter::Get() {
|
|
|
| void AecDumpMessageFilter::AddDelegate(
|
| AecDumpMessageFilter::AecDumpDelegate* delegate) {
|
| - DCHECK(main_message_loop_->BelongsToCurrentThread());
|
| + DCHECK(main_task_runner_->BelongsToCurrentThread());
|
| DCHECK(delegate);
|
| DCHECK_EQ(kInvalidDelegateId, GetIdForDelegate(delegate));
|
|
|
| int id = delegate_id_counter_++;
|
| delegates_[id] = delegate;
|
|
|
| - io_message_loop_->PostTask(
|
| + io_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(
|
| - &AecDumpMessageFilter::RegisterAecDumpConsumer,
|
| - this,
|
| - id));
|
| + base::Bind(&AecDumpMessageFilter::RegisterAecDumpConsumer, this, id));
|
| }
|
|
|
| void AecDumpMessageFilter::RemoveDelegate(
|
| AecDumpMessageFilter::AecDumpDelegate* delegate) {
|
| - DCHECK(main_message_loop_->BelongsToCurrentThread());
|
| + DCHECK(main_task_runner_->BelongsToCurrentThread());
|
| DCHECK(delegate);
|
|
|
| int id = GetIdForDelegate(delegate);
|
| DCHECK_NE(kInvalidDelegateId, id);
|
| delegates_.erase(id);
|
|
|
| - io_message_loop_->PostTask(
|
| + io_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(
|
| - &AecDumpMessageFilter::UnregisterAecDumpConsumer,
|
| - this,
|
| - id));
|
| + base::Bind(&AecDumpMessageFilter::UnregisterAecDumpConsumer, this, id));
|
| }
|
|
|
| void AecDumpMessageFilter::Send(IPC::Message* message) {
|
| - DCHECK(io_message_loop_->BelongsToCurrentThread());
|
| + DCHECK(io_task_runner_->BelongsToCurrentThread());
|
| if (sender_)
|
| sender_->Send(message);
|
| else
|
| @@ -90,7 +84,7 @@ void AecDumpMessageFilter::UnregisterAecDumpConsumer(int id) {
|
| }
|
|
|
| bool AecDumpMessageFilter::OnMessageReceived(const IPC::Message& message) {
|
| - DCHECK(io_message_loop_->BelongsToCurrentThread());
|
| + DCHECK(io_task_runner_->BelongsToCurrentThread());
|
| bool handled = true;
|
| IPC_BEGIN_MESSAGE_MAP(AecDumpMessageFilter, message)
|
| IPC_MESSAGE_HANDLER(AecDumpMsg_EnableAecDump, OnEnableAecDump)
|
| @@ -101,12 +95,12 @@ bool AecDumpMessageFilter::OnMessageReceived(const IPC::Message& message) {
|
| }
|
|
|
| void AecDumpMessageFilter::OnFilterAdded(IPC::Sender* sender) {
|
| - DCHECK(io_message_loop_->BelongsToCurrentThread());
|
| + DCHECK(io_task_runner_->BelongsToCurrentThread());
|
| sender_ = sender;
|
| }
|
|
|
| void AecDumpMessageFilter::OnFilterRemoved() {
|
| - DCHECK(io_message_loop_->BelongsToCurrentThread());
|
| + DCHECK(io_task_runner_->BelongsToCurrentThread());
|
|
|
| // Once removed, a filter will not be used again. At this time the
|
| // observer must be notified so it releases its reference.
|
| @@ -114,41 +108,32 @@ void AecDumpMessageFilter::OnFilterRemoved() {
|
| }
|
|
|
| void AecDumpMessageFilter::OnChannelClosing() {
|
| - DCHECK(io_message_loop_->BelongsToCurrentThread());
|
| + DCHECK(io_task_runner_->BelongsToCurrentThread());
|
| sender_ = NULL;
|
| - main_message_loop_->PostTask(
|
| + main_task_runner_->PostTask(
|
| FROM_HERE,
|
| - base::Bind(
|
| - &AecDumpMessageFilter::DoChannelClosingOnDelegates,
|
| - this));
|
| + base::Bind(&AecDumpMessageFilter::DoChannelClosingOnDelegates, this));
|
| }
|
|
|
| void AecDumpMessageFilter::OnEnableAecDump(
|
| int id,
|
| IPC::PlatformFileForTransit file_handle) {
|
| - DCHECK(io_message_loop_->BelongsToCurrentThread());
|
| - main_message_loop_->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(
|
| - &AecDumpMessageFilter::DoEnableAecDump,
|
| - this,
|
| - id,
|
| - file_handle));
|
| + DCHECK(io_task_runner_->BelongsToCurrentThread());
|
| + main_task_runner_->PostTask(
|
| + FROM_HERE, base::Bind(&AecDumpMessageFilter::DoEnableAecDump, this, id,
|
| + file_handle));
|
| }
|
|
|
| void AecDumpMessageFilter::OnDisableAecDump() {
|
| - DCHECK(io_message_loop_->BelongsToCurrentThread());
|
| - main_message_loop_->PostTask(
|
| - FROM_HERE,
|
| - base::Bind(
|
| - &AecDumpMessageFilter::DoDisableAecDump,
|
| - this));
|
| + DCHECK(io_task_runner_->BelongsToCurrentThread());
|
| + main_task_runner_->PostTask(
|
| + FROM_HERE, base::Bind(&AecDumpMessageFilter::DoDisableAecDump, this));
|
| }
|
|
|
| void AecDumpMessageFilter::DoEnableAecDump(
|
| int id,
|
| IPC::PlatformFileForTransit file_handle) {
|
| - DCHECK(main_message_loop_->BelongsToCurrentThread());
|
| + DCHECK(main_task_runner_->BelongsToCurrentThread());
|
| DelegateMap::iterator it = delegates_.find(id);
|
| if (it != delegates_.end()) {
|
| it->second->OnAecDumpFile(file_handle);
|
| @@ -161,7 +146,7 @@ void AecDumpMessageFilter::DoEnableAecDump(
|
| }
|
|
|
| void AecDumpMessageFilter::DoDisableAecDump() {
|
| - DCHECK(main_message_loop_->BelongsToCurrentThread());
|
| + DCHECK(main_task_runner_->BelongsToCurrentThread());
|
| for (DelegateMap::iterator it = delegates_.begin();
|
| it != delegates_.end(); ++it) {
|
| it->second->OnDisableAecDump();
|
| @@ -169,7 +154,7 @@ void AecDumpMessageFilter::DoDisableAecDump() {
|
| }
|
|
|
| void AecDumpMessageFilter::DoChannelClosingOnDelegates() {
|
| - DCHECK(main_message_loop_->BelongsToCurrentThread());
|
| + DCHECK(main_task_runner_->BelongsToCurrentThread());
|
| for (DelegateMap::iterator it = delegates_.begin();
|
| it != delegates_.end(); ++it) {
|
| it->second->OnIpcClosing();
|
| @@ -179,7 +164,7 @@ void AecDumpMessageFilter::DoChannelClosingOnDelegates() {
|
|
|
| int AecDumpMessageFilter::GetIdForDelegate(
|
| AecDumpMessageFilter::AecDumpDelegate* delegate) {
|
| - DCHECK(main_message_loop_->BelongsToCurrentThread());
|
| + DCHECK(main_task_runner_->BelongsToCurrentThread());
|
| for (DelegateMap::iterator it = delegates_.begin();
|
| it != delegates_.end(); ++it) {
|
| if (it->second == delegate)
|
|
|