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

content/common/gpu/gpu_channel.cc

Index: content/common/gpu/gpu_channel.cc
===================================================================
--- content/common/gpu/gpu_channel.cc	(revision 278168)
+++ content/common/gpu/gpu_channel.cc	(working copy)
@@ -77,24 +77,24 @@
                           scoped_refptr<base::MessageLoopProxy> message_loop)
       : preemption_state_(IDLE),
         gpu_channel_(gpu_channel),
-        sender_(NULL),
+        channel_(NULL),
         sync_point_manager_(sync_point_manager),
         message_loop_(message_loop),
         messages_forwarded_to_channel_(0),
         a_stub_is_descheduled_(false) {}
 
-  virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE {
-    DCHECK(!sender_);
-    sender_ = sender;
+  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE {
+    DCHECK(!channel_);
+    channel_ = channel;
   }
 
   virtual void OnFilterRemoved() OVERRIDE {
-    DCHECK(sender_);
-    sender_ = NULL;
+    DCHECK(channel_);
+    channel_ = NULL;
   }
 
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE {
-    DCHECK(sender_);
+    DCHECK(channel_);
 
     bool handled = false;
     if (message.type() == GpuCommandBufferMsg_RetireSyncPoint::ID) {
@@ -148,7 +148,7 @@
   }
 
   bool Send(IPC::Message* message) {
-    return sender_->Send(message);
+    return channel_->Send(message);
   }
 
  protected:
@@ -359,7 +359,7 @@
   // NOTE: this weak pointer is never dereferenced on the IO thread, it's only
   // passed through - therefore the WeakPtr assumptions are respected.
   base::WeakPtr<GpuChannel> gpu_channel_;
-  IPC::Sender* sender_;
+  IPC::Channel* channel_;
   scoped_refptr<SyncPointManager> sync_point_manager_;
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   scoped_refptr<gpu::PreemptionFlag> preempting_flag_;