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

content/public/browser/browser_message_filter.cc

Index: content/public/browser/browser_message_filter.cc
===================================================================
--- content/public/browser/browser_message_filter.cc	(revision 278168)
+++ content/public/browser/browser_message_filter.cc	(working copy)
@@ -30,9 +30,9 @@
   virtual ~Internal() {}
 
   // IPC::MessageFilter implementation:
-  virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE {
-    filter_->sender_ = sender;
-    filter_->OnFilterAdded(sender);
+  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE {
+    filter_->channel_ = channel;
+    filter_->OnFilterAdded(channel);
   }
 
   virtual void OnFilterRemoved() OVERRIDE {
@@ -40,7 +40,7 @@
   }
 
   virtual void OnChannelClosing() OVERRIDE {
-    filter_->sender_ = NULL;
+    filter_->channel_ = NULL;
     filter_->OnChannelClosing();
   }
 
@@ -101,7 +101,7 @@
 
 BrowserMessageFilter::BrowserMessageFilter(uint32 message_class_to_filter)
     : internal_(NULL),
-      sender_(NULL),
+      channel_(NULL),
 #if defined(OS_WIN)
       peer_handle_(base::kNullProcessHandle),
 #endif
@@ -112,7 +112,7 @@
     const uint32* message_classes_to_filter,
     size_t num_message_classes_to_filter)
     : internal_(NULL),
-      sender_(NULL),
+      channel_(NULL),
 #if defined(OS_WIN)
       peer_handle_(base::kNullProcessHandle),
 #endif
@@ -161,8 +161,8 @@
     return true;
   }
 
-  if (sender_)
-    return sender_->Send(message);
+  if (channel_)
+    return channel_->Send(message);
 
   delete message;
   return false;