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..ceedc92b93518ab291acbcd45bd1a62bdd5751ac 100644 |
--- a/content/renderer/media/aec_dump_message_filter.cc |
+++ b/content/renderer/media/aec_dump_message_filter.cc |
@@ -10,10 +10,6 @@ |
#include "content/renderer/media/webrtc_logging.h" |
#include "ipc/ipc_logging.h" |
#include "ipc/ipc_sender.h" |
-# |
-namespace { |
-const int kInvalidDelegateId = -1; |
-} |
namespace content { |
@@ -24,7 +20,6 @@ AecDumpMessageFilter::AecDumpMessageFilter( |
const scoped_refptr<base::SingleThreadTaskRunner>& main_task_runner, |
PeerConnectionDependencyFactory* peerconnection_dependency_factory) |
: sender_(NULL), |
- delegate_id_counter_(1), |
io_task_runner_(io_task_runner), |
main_task_runner_(main_task_runner), |
peerconnection_dependency_factory_(peerconnection_dependency_factory) { |
@@ -42,34 +37,6 @@ scoped_refptr<AecDumpMessageFilter> AecDumpMessageFilter::Get() { |
return g_filter; |
} |
-void AecDumpMessageFilter::AddDelegate( |
- AecDumpMessageFilter::AecDumpDelegate* delegate) { |
- DCHECK(main_task_runner_->BelongsToCurrentThread()); |
- DCHECK(delegate); |
- DCHECK_EQ(kInvalidDelegateId, GetIdForDelegate(delegate)); |
- |
- int id = delegate_id_counter_++; |
- delegates_[id] = delegate; |
- |
- io_task_runner_->PostTask( |
- FROM_HERE, |
- base::Bind(&AecDumpMessageFilter::RegisterAecDumpConsumer, this, id)); |
-} |
- |
-void AecDumpMessageFilter::RemoveDelegate( |
- AecDumpMessageFilter::AecDumpDelegate* delegate) { |
- DCHECK(main_task_runner_->BelongsToCurrentThread()); |
- DCHECK(delegate); |
- |
- int id = GetIdForDelegate(delegate); |
- DCHECK_NE(kInvalidDelegateId, id); |
- delegates_.erase(id); |
- |
- io_task_runner_->PostTask( |
- FROM_HERE, |
- base::Bind(&AecDumpMessageFilter::UnregisterAecDumpConsumer, this, id)); |
-} |
- |
void AecDumpMessageFilter::Send(IPC::Message* message) { |
DCHECK(io_task_runner_->BelongsToCurrentThread()); |
if (sender_) |
@@ -78,21 +45,11 @@ void AecDumpMessageFilter::Send(IPC::Message* message) { |
delete message; |
} |
-void AecDumpMessageFilter::RegisterAecDumpConsumer(int id) { |
- Send(new AecDumpMsg_RegisterAecDumpConsumer(id)); |
-} |
- |
-void AecDumpMessageFilter::UnregisterAecDumpConsumer(int id) { |
- Send(new AecDumpMsg_UnregisterAecDumpConsumer(id)); |
-} |
- |
bool AecDumpMessageFilter::OnMessageReceived(const IPC::Message& message) { |
DCHECK(io_task_runner_->BelongsToCurrentThread()); |
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() |
@@ -115,18 +72,6 @@ void AecDumpMessageFilter::OnFilterRemoved() { |
void AecDumpMessageFilter::OnChannelClosing() { |
DCHECK(io_task_runner_->BelongsToCurrentThread()); |
sender_ = NULL; |
- main_task_runner_->PostTask( |
- FROM_HERE, |
- base::Bind(&AecDumpMessageFilter::DoChannelClosingOnDelegates, this)); |
-} |
- |
-void AecDumpMessageFilter::OnEnableAecDump( |
- int id, |
- IPC::PlatformFileForTransit file_handle) { |
- DCHECK(io_task_runner_->BelongsToCurrentThread()); |
- main_task_runner_->PostTask( |
- FROM_HERE, base::Bind(&AecDumpMessageFilter::DoEnableAecDump, this, id, |
- file_handle)); |
} |
void AecDumpMessageFilter::OnEnableEventLog( |
@@ -138,33 +83,12 @@ void AecDumpMessageFilter::OnEnableEventLog( |
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) { |
- DCHECK(main_task_runner_->BelongsToCurrentThread()); |
- DelegateMap::iterator it = delegates_.find(id); |
- if (it != delegates_.end()) { |
- it->second->OnAecDumpFile(file_handle); |
- } else { |
- // Delegate has been removed, we must close the file. |
- base::File file = IPC::PlatformFileForTransitToFile(file_handle); |
- DCHECK(file.IsValid()); |
- file.Close(); |
- } |
-} |
- |
void AecDumpMessageFilter::DoEnableEventLog( |
int id, |
IPC::PlatformFileForTransit file_handle) { |
@@ -173,37 +97,9 @@ void AecDumpMessageFilter::DoEnableEventLog( |
IPC::PlatformFileForTransitToPlatformFile(file_handle)); |
} |
-void AecDumpMessageFilter::DoDisableAecDump() { |
- DCHECK(main_task_runner_->BelongsToCurrentThread()); |
- for (DelegateMap::iterator it = delegates_.begin(); |
- it != delegates_.end(); ++it) { |
- it->second->OnDisableAecDump(); |
- } |
-} |
- |
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(); |
- it != delegates_.end(); ++it) { |
- it->second->OnIpcClosing(); |
- } |
- delegates_.clear(); |
-} |
- |
-int AecDumpMessageFilter::GetIdForDelegate( |
- AecDumpMessageFilter::AecDumpDelegate* delegate) { |
- DCHECK(main_task_runner_->BelongsToCurrentThread()); |
- for (DelegateMap::iterator it = delegates_.begin(); |
- it != delegates_.end(); ++it) { |
- if (it->second == delegate) |
- return it->first; |
- } |
- return kInvalidDelegateId; |
-} |
- |
} // namespace content |