| 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 01a6d0b900a5e750113568c1be3dc05a63e09fc0..1d6ac4b4121048d53a89572e439dab7029836d95 100644
|
| --- a/content/renderer/media/aec_dump_message_filter.cc
|
| +++ b/content/renderer/media/aec_dump_message_filter.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "base/single_thread_task_runner.h"
|
| #include "content/common/media/aec_dump_messages.h"
|
| -#include "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
|
| #include "content/renderer/media/webrtc_logging.h"
|
| #include "ipc/ipc_logging.h"
|
| #include "ipc/ipc_sender.h"
|
| @@ -21,13 +20,11 @@ AecDumpMessageFilter* AecDumpMessageFilter::g_filter = NULL;
|
|
|
| AecDumpMessageFilter::AecDumpMessageFilter(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner,
|
| - const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner,
|
| - PeerConnectionDependencyFactory* peerconnection_dependency_factory)
|
| + const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner)
|
| : sender_(NULL),
|
| delegate_id_counter_(1),
|
| io_task_runner_(io_task_runner),
|
| - main_task_runner_(main_task_runner),
|
| - peerconnection_dependency_factory_(peerconnection_dependency_factory) {
|
| + main_task_runner_(main_task_runner) {
|
| DCHECK(!g_filter);
|
| g_filter = this;
|
| }
|
| @@ -91,9 +88,7 @@ bool AecDumpMessageFilter::OnMessageReceived(const IPC::Message& message) {
|
| bool handled = true;
|
| IPC_BEGIN_MESSAGE_MAP(AecDumpMessageFilter, message)
|
| IPC_MESSAGE_HANDLER(AecDumpMsg_EnableAecDump, OnEnableAecDump)
|
| - IPC_MESSAGE_HANDLER(WebRTCEventLogMsg_EnableEventLog, OnEnableEventLog)
|
| IPC_MESSAGE_HANDLER(AecDumpMsg_DisableAecDump, OnDisableAecDump)
|
| - IPC_MESSAGE_HANDLER(WebRTCEventLogMsg_DisableEventLog, OnDisableEventLog)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| return handled;
|
| @@ -129,27 +124,12 @@ void AecDumpMessageFilter::OnEnableAecDump(
|
| file_handle));
|
| }
|
|
|
| -void AecDumpMessageFilter::OnEnableEventLog(
|
| - int id,
|
| - IPC::PlatformFileForTransit file_handle) {
|
| - DCHECK(io_task_runner_->BelongsToCurrentThread());
|
| - main_task_runner_->PostTask(
|
| - FROM_HERE, base::Bind(&AecDumpMessageFilter::DoEnableEventLog, this, id,
|
| - file_handle));
|
| -}
|
| -
|
| void AecDumpMessageFilter::OnDisableAecDump() {
|
| DCHECK(io_task_runner_->BelongsToCurrentThread());
|
| main_task_runner_->PostTask(
|
| FROM_HERE, base::Bind(&AecDumpMessageFilter::DoDisableAecDump, this));
|
| }
|
|
|
| -void AecDumpMessageFilter::OnDisableEventLog() {
|
| - DCHECK(io_task_runner_->BelongsToCurrentThread());
|
| - main_task_runner_->PostTask(
|
| - FROM_HERE, base::Bind(&AecDumpMessageFilter::DoDisableEventLog, this));
|
| -}
|
| -
|
| void AecDumpMessageFilter::DoEnableAecDump(
|
| int id,
|
| IPC::PlatformFileForTransit file_handle) {
|
| @@ -165,14 +145,6 @@ void AecDumpMessageFilter::DoEnableAecDump(
|
| }
|
| }
|
|
|
| -void AecDumpMessageFilter::DoEnableEventLog(
|
| - int id,
|
| - IPC::PlatformFileForTransit file_handle) {
|
| - DCHECK(main_task_runner_->BelongsToCurrentThread());
|
| - peerconnection_dependency_factory_->StartRtcEventLog(
|
| - IPC::PlatformFileForTransitToPlatformFile(file_handle));
|
| -}
|
| -
|
| void AecDumpMessageFilter::DoDisableAecDump() {
|
| DCHECK(main_task_runner_->BelongsToCurrentThread());
|
| for (DelegateMap::iterator it = delegates_.begin();
|
| @@ -181,11 +153,6 @@ void AecDumpMessageFilter::DoDisableAecDump() {
|
| }
|
| }
|
|
|
| -void AecDumpMessageFilter::DoDisableEventLog() {
|
| - DCHECK(main_task_runner_->BelongsToCurrentThread());
|
| - peerconnection_dependency_factory_->StopRtcEventLog();
|
| -}
|
| -
|
| void AecDumpMessageFilter::DoChannelClosingOnDelegates() {
|
| DCHECK(main_task_runner_->BelongsToCurrentThread());
|
| for (DelegateMap::iterator it = delegates_.begin();
|
|
|