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

content/common/gpu/media/gpu_video_decode_accelerator.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/media/gpu_video_decode_accelerator.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 58 matching lines @@
  public:
   explicit DebugAutoLock(base::Lock&) {}
 };
 #endif
 
 class GpuVideoDecodeAccelerator::MessageFilter : public IPC::MessageFilter {
  public:
   MessageFilter(GpuVideoDecodeAccelerator* owner, int32 host_route_id)
       : owner_(owner), host_route_id_(host_route_id) {}
 
-  virtual void OnChannelError() OVERRIDE { sender_ = NULL; }
+  virtual void OnChannelError() OVERRIDE { channel_ = NULL; }
 
-  virtual void OnChannelClosing() OVERRIDE { sender_ = NULL; }
+  virtual void OnChannelClosing() OVERRIDE { channel_ = NULL; }
 
-  virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE {
-    sender_ = sender;
+  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE {
+    channel_ = channel;
   }
 
   virtual void OnFilterRemoved() OVERRIDE {
     // This will delete |owner_| and |this|.
     owner_->OnFilterRemoved();
   }
 
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE {
     if (msg.routing_id() != host_route_id_)
       return false;
 
     IPC_BEGIN_MESSAGE_MAP(MessageFilter, msg)
       IPC_MESSAGE_FORWARD(AcceleratedVideoDecoderMsg_Decode, owner_,
                           GpuVideoDecodeAccelerator::OnDecode)
       IPC_MESSAGE_UNHANDLED(return false;)
     IPC_END_MESSAGE_MAP()
     return true;
   }
 
   bool SendOnIOThread(IPC::Message* message) {
     DCHECK(!message->is_sync());
-    if (!sender_) {
+    if (!channel_) {
       delete message;
       return false;
     }
-    return sender_->Send(message);
+    return channel_->Send(message);
   }
 
  protected:
   virtual ~MessageFilter() {}
 
  private:
   GpuVideoDecodeAccelerator* owner_;
   int32 host_route_id_;
-  // The sender to which this filter was added.
-  IPC::Sender* sender_;
+  // The channel to which this filter was added.
+  IPC::Channel* channel_;
 };
 
 GpuVideoDecodeAccelerator::GpuVideoDecodeAccelerator(
     int32 host_route_id,
     GpuCommandBufferStub* stub,
     const scoped_refptr<base::MessageLoopProxy>& io_message_loop)
     : host_route_id_(host_route_id),
       stub_(stub),
       texture_target_(0),
       filter_removed_(true, false),
@@ skipping 374 matching lines @@
   return stub_->channel()->Send(message);
 }
 
 void GpuVideoDecodeAccelerator::SendCreateDecoderReply(IPC::Message* message,
                                                        bool succeeded) {
   GpuCommandBufferMsg_CreateVideoDecoder::WriteReplyParams(message, succeeded);
   Send(message);
 }
 
 }  // namespace content