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

content/renderer/media/video_capture_message_filter.cc

Index: content/renderer/media/video_capture_message_filter.cc
===================================================================
--- content/renderer/media/video_capture_message_filter.cc	(revision 278168)
+++ content/renderer/media/video_capture_message_filter.cc	(working copy)
@@ -6,13 +6,13 @@
 
 #include "content/common/media/video_capture_messages.h"
 #include "content/common/view_messages.h"
-#include "ipc/ipc_sender.h"
+#include "ipc/ipc_channel.h"
 
 namespace content {
 
 VideoCaptureMessageFilter::VideoCaptureMessageFilter()
     : last_device_id_(0),
-      sender_(NULL) {
+      channel_(NULL) {
 }
 
 void VideoCaptureMessageFilter::AddDelegate(Delegate* delegate) {
@@ -21,7 +21,7 @@
   while (delegates_.find(last_device_id_) != delegates_.end())
     last_device_id_++;
 
-  if (sender_) {
+  if (channel_) {
     delegates_[last_device_id_] = delegate;
     delegate->OnDelegateAdded(last_device_id_);
   } else {
@@ -47,12 +47,12 @@
 }
 
 bool VideoCaptureMessageFilter::Send(IPC::Message* message) {
-  if (!sender_) {
+  if (!channel_) {
     delete message;
     return false;
   }
 
-  return sender_->Send(message);
+  return channel_->Send(message);
 }
 
 bool VideoCaptureMessageFilter::OnMessageReceived(const IPC::Message& message) {
@@ -73,9 +73,9 @@
   return handled;
 }
 
-void VideoCaptureMessageFilter::OnFilterAdded(IPC::Sender* sender) {
+void VideoCaptureMessageFilter::OnFilterAdded(IPC::Channel* channel) {
   DVLOG(1) << "VideoCaptureMessageFilter::OnFilterAdded()";
-  sender_ = sender;
+  channel_ = channel;
 
   for (Delegates::iterator it = pending_delegates_.begin();
        it != pending_delegates_.end(); it++) {
@@ -86,11 +86,11 @@
 }
 
 void VideoCaptureMessageFilter::OnFilterRemoved() {
-  sender_ = NULL;
+  channel_ = NULL;
 }
 
 void VideoCaptureMessageFilter::OnChannelClosing() {
-  sender_ = NULL;
+  channel_ = NULL;
 }
 
 VideoCaptureMessageFilter::~VideoCaptureMessageFilter() {}