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

ipc/ipc_sync_message_filter.cc

Index: ipc/ipc_sync_message_filter.cc
===================================================================
--- ipc/ipc_sync_message_filter.cc	(revision 278168)
+++ ipc/ipc_sync_message_filter.cc	(working copy)
@@ -17,7 +17,7 @@
 namespace IPC {
 
 SyncMessageFilter::SyncMessageFilter(base::WaitableEvent* shutdown_event)
-    : sender_(NULL),
+    : channel_(NULL),
       listener_loop_(MessageLoopProxy::current()),
       shutdown_event_(shutdown_event) {
 }
@@ -67,19 +67,19 @@
   return pending_message.send_result;
 }
 
-void SyncMessageFilter::OnFilterAdded(Sender* sender) {
-  sender_ = sender;
+void SyncMessageFilter::OnFilterAdded(Channel* channel) {
+  channel_ = channel;
   base::AutoLock auto_lock(lock_);
   io_loop_ = MessageLoopProxy::current();
 }
 
 void SyncMessageFilter::OnChannelError() {
-  sender_ = NULL;
+  channel_ = NULL;
   SignalAllEvents();
 }
 
 void SyncMessageFilter::OnChannelClosing() {
-  sender_ = NULL;
+  channel_ = NULL;
   SignalAllEvents();
 }
 
@@ -104,8 +104,8 @@
 }
 
 void SyncMessageFilter::SendOnIOThread(Message* message) {
-  if (sender_) {
-    sender_->Send(message);
+  if (channel_) {
+    channel_->Send(message);
     return;
   }