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