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

chrome/renderer/media/cast_ipc_dispatcher.h

 // 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.
 
 #ifndef CHROME_RENDERER_MEDIA_CAST_IPC_DISPATCHER_H_
 #define CHROME_RENDERER_MEDIA_CAST_IPC_DISPATCHER_H_
 
 #include "base/callback.h"
 #include "base/id_map.h"
 #include "ipc/ipc_channel_proxy.h"
@@ skipping 11 matching lines @@
   explicit CastIPCDispatcher(
       const scoped_refptr<base::MessageLoopProxy>& io_message_loop);
 
   static CastIPCDispatcher* Get();
   void Send(IPC::Message* message);
   int32 AddSender(CastTransportSenderIPC* sender);
   void RemoveSender(int32 channel_id);
 
   // IPC::MessageFilter implementation
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE;
+  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
   virtual void OnFilterRemoved() OVERRIDE;
   virtual void OnChannelClosing() OVERRIDE;
 
  protected:
   virtual ~CastIPCDispatcher();
 
  private:
   void OnReceivedPacket(int32 channel_id, const media::cast::Packet& packet);
   void OnNotifyStatusChange(
       int32 channel_id,
       media::cast::transport::CastTransportStatus status);
   void OnRtpStatistics(
       int32 channel_id,
       bool audio,
       const media::cast::transport::RtcpSenderInfo& sender_info,
       base::TimeTicks time_sent,
       uint32 rtp_timestamp);
   void OnRawEvents(int32 channel_id,
                    const std::vector<media::cast::PacketEvent>& packet_events);
 
   static CastIPCDispatcher* global_instance_;
 
-  // For IPC Send(); must only be accesed on |io_message_loop_|.
-  IPC::Sender* sender_;
+  // IPC channel for Send(); must only be accesed on |io_message_loop_|.
+  IPC::Channel* channel_;
 
   // Message loop on which IPC calls are driven.
   const scoped_refptr<base::MessageLoopProxy> io_message_loop_;
 
   // A map of stream ids to delegates; must only be accessed on
   // |io_message_loop_|.
   IDMap<CastTransportSenderIPC> id_map_;
   DISALLOW_COPY_AND_ASSIGN(CastIPCDispatcher);
 };
 
 #endif  // CHROME_RENDERER_MEDIA_CAST_IPC_DISPATCHER_H_