Decouple IPC::MessageFilter from IPC::Channel

ipc/ipc_sync_message_filter.cc

Index: ipc/ipc_sync_message_filter.cc
diff --git a/ipc/ipc_sync_message_filter.cc b/ipc/ipc_sync_message_filter.cc
index 3833d2b20574d62f493b47217f566bd9527a9121..2c23b83cf38524b28c18759f298f4751663adb70 100644
--- a/ipc/ipc_sync_message_filter.cc
+++ b/ipc/ipc_sync_message_filter.cc
@@ -17,7 +17,7 @@ using base::MessageLoopProxy;
 namespace IPC {
 
 SyncMessageFilter::SyncMessageFilter(base::WaitableEvent* shutdown_event)
-    : channel_(NULL),
+    : sender_(NULL),
       listener_loop_(MessageLoopProxy::current()),
       shutdown_event_(shutdown_event) {
 }
@@ -67,19 +67,19 @@ bool SyncMessageFilter::Send(Message* message) {
   return pending_message.send_result;
 }
 
-void SyncMessageFilter::OnFilterAdded(Channel* channel) {
-  channel_ = channel;
+void SyncMessageFilter::OnFilterAdded(Sender* sender) {
+  sender_ = sender;
   base::AutoLock auto_lock(lock_);
   io_loop_ = MessageLoopProxy::current();
 }
 
-void SyncMessageFilter::OnChannelError() {
-  channel_ = NULL;
+void SyncMessageFilter::OnSenderError() {
+  sender_ = NULL;
   SignalAllEvents();
 }
 
-void SyncMessageFilter::OnChannelClosing() {
-  channel_ = NULL;
+void SyncMessageFilter::OnSenderClosing() {
+  sender_ = NULL;
   SignalAllEvents();
 }
 
@@ -104,8 +104,8 @@ SyncMessageFilter::~SyncMessageFilter() {
 }
 
 void SyncMessageFilter::SendOnIOThread(Message* message) {
-  if (channel_) {
-    channel_->Send(message);
+  if (sender_) {
+    sender_->Send(message);
     return;
   }