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

content/child/child_histogram_message_filter.cc

Index: content/child/child_histogram_message_filter.cc
===================================================================
--- content/child/child_histogram_message_filter.cc	(revision 278168)
+++ content/child/child_histogram_message_filter.cc	(working copy)
@@ -12,20 +12,20 @@
 #include "content/child/child_process.h"
 #include "content/child/child_thread.h"
 #include "content/common/child_process_messages.h"
-#include "ipc/ipc_sender.h"
+#include "ipc/ipc_channel.h"
 
 namespace content {
 
 ChildHistogramMessageFilter::ChildHistogramMessageFilter()
-    : sender_(NULL),
+    : channel_(NULL),
       io_message_loop_(ChildProcess::current()->io_message_loop_proxy()) {
 }
 
 ChildHistogramMessageFilter::~ChildHistogramMessageFilter() {
 }
 
-void ChildHistogramMessageFilter::OnFilterAdded(IPC::Sender* sender) {
-  sender_ = sender;
+void ChildHistogramMessageFilter::OnFilterAdded(IPC::Channel* channel) {
+  channel_ = channel;
 }
 
 void ChildHistogramMessageFilter::OnFilterRemoved() {
@@ -60,7 +60,7 @@
 
   std::vector<std::string> deltas;
   histogram_delta_serialization_->PrepareAndSerializeDeltas(&deltas);
-  sender_->Send(
+  channel_->Send(
       new ChildProcessHostMsg_ChildHistogramData(sequence_number, deltas));
 
   static int count = 0;