Revert 276939 "Decouple IPC::MessageFilter from IPC::Channel"

chrome/renderer/media/cast_ipc_dispatcher.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/media/cast_ipc_dispatcher.h"
 
 #include "chrome/common/cast_messages.h"
 #include "chrome/renderer/media/cast_transport_sender_ipc.h"
 #include "ipc/ipc_message_macros.h"
 
 CastIPCDispatcher* CastIPCDispatcher::global_instance_ = NULL;
 
 CastIPCDispatcher::CastIPCDispatcher(
     const scoped_refptr<base::MessageLoopProxy>& io_message_loop)
-    : sender_(NULL),
+    : channel_(NULL),
       io_message_loop_(io_message_loop) {
   DCHECK(io_message_loop_);
   DCHECK(!global_instance_);
 }
 
 CastIPCDispatcher::~CastIPCDispatcher() {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   DCHECK(!global_instance_);
 }
 
 CastIPCDispatcher* CastIPCDispatcher::Get() {
   return global_instance_;
 }
 
 void CastIPCDispatcher::Send(IPC::Message* message) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
-  if (sender_) {
-    sender_->Send(message);
+  if (channel_) {
+    channel_->Send(message);
   } else {
     delete message;
   }
 }
 
 int32 CastIPCDispatcher::AddSender(CastTransportSenderIPC* sender) {
   return id_map_.Add(sender);
 }
 
 void CastIPCDispatcher::RemoveSender(int32 channel_id) {
   return id_map_.Remove(channel_id);
 }
 
 bool CastIPCDispatcher::OnMessageReceived(const IPC::Message& message) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(CastIPCDispatcher, message)
     IPC_MESSAGE_HANDLER(CastMsg_ReceivedPacket, OnReceivedPacket)
     IPC_MESSAGE_HANDLER(CastMsg_NotifyStatusChange, OnNotifyStatusChange)
     IPC_MESSAGE_HANDLER(CastMsg_RawEvents, OnRawEvents)
     IPC_MESSAGE_UNHANDLED(handled = false);
   IPC_END_MESSAGE_MAP();
   return handled;
 }
 
-void CastIPCDispatcher::OnFilterAdded(IPC::Sender* sender) {
+void CastIPCDispatcher::OnFilterAdded(IPC::Channel* channel) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   DCHECK(!global_instance_);
   global_instance_ = this;
-  sender_ = sender;
+  channel_ = channel;
 }
 
 void CastIPCDispatcher::OnFilterRemoved() {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   DCHECK_EQ(this, global_instance_);
   global_instance_ = NULL;
-  sender_ = NULL;
+  channel_ = NULL;
 }
 
 void CastIPCDispatcher::OnChannelClosing() {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   DCHECK_EQ(this, global_instance_);
 }
 
 void CastIPCDispatcher::OnReceivedPacket(
     int32 channel_id,
     const media::cast::transport::Packet& packet) {
@@ skipping 21 matching lines @@
 void CastIPCDispatcher::OnRawEvents(
     int32 channel_id,
     const std::vector<media::cast::PacketEvent>& packet_events) {
   CastTransportSenderIPC* sender = id_map_.Lookup(channel_id);
   if (sender) {
     sender->OnRawEvents(packet_events);
   } else {
     DVLOG(1) << "CastIPCDispatcher::OnRawEvents on non-existing channel.";
   }
 }