Decouple IPC::MessageFilter from IPC::Channel

chrome/renderer/media/cast_ipc_dispatcher.cc

Index: chrome/renderer/media/cast_ipc_dispatcher.cc
diff --git a/chrome/renderer/media/cast_ipc_dispatcher.cc b/chrome/renderer/media/cast_ipc_dispatcher.cc
index 5be10754b91721dac4d33cf678af2cd783a37bbe..80de8a10d27d283e5021f17fda157e67fa8ed9bc 100644
--- a/chrome/renderer/media/cast_ipc_dispatcher.cc
+++ b/chrome/renderer/media/cast_ipc_dispatcher.cc
@@ -12,7 +12,7 @@ CastIPCDispatcher* CastIPCDispatcher::global_instance_ = NULL;
 
 CastIPCDispatcher::CastIPCDispatcher(
     const scoped_refptr<base::MessageLoopProxy>& io_message_loop)
-    : channel_(NULL),
+    : sender_(NULL),
       io_message_loop_(io_message_loop) {
   DCHECK(io_message_loop_);
   DCHECK(!global_instance_);
@@ -29,8 +29,8 @@ CastIPCDispatcher* CastIPCDispatcher::Get() {
 
 void CastIPCDispatcher::Send(IPC::Message* message) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
-  if (channel_) {
-    channel_->Send(message);
+  if (sender_) {
+    sender_->Send(message);
   } else {
     delete message;
   }
@@ -40,8 +40,8 @@ int32 CastIPCDispatcher::AddSender(CastTransportSenderIPC* sender) {
   return id_map_.Add(sender);
 }
 
-void CastIPCDispatcher::RemoveSender(int32 channel_id) {
-  return id_map_.Remove(channel_id);
+void CastIPCDispatcher::RemoveSender(int32 sender_id) {
+  return id_map_.Remove(sender_id);
 }
 
 bool CastIPCDispatcher::OnMessageReceived(const IPC::Message& message) {
@@ -56,21 +56,21 @@ bool CastIPCDispatcher::OnMessageReceived(const IPC::Message& message) {
   return handled;
 }
 
-void CastIPCDispatcher::OnFilterAdded(IPC::Channel* channel) {
+void CastIPCDispatcher::OnFilterAdded(IPC::Sender* sender) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   DCHECK(!global_instance_);
   global_instance_ = this;
-  channel_ = channel;
+  sender_ = sender;
 }
 
 void CastIPCDispatcher::OnFilterRemoved() {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   DCHECK_EQ(this, global_instance_);
   global_instance_ = NULL;
-  channel_ = NULL;
+  sender_ = NULL;
 }
 
-void CastIPCDispatcher::OnChannelClosing() {
+void CastIPCDispatcher::OnSenderClosing() {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   DCHECK_EQ(this, global_instance_);
 }