Decouple IPC::MessageFilter from IPC::Channel

content/renderer/media/midi_message_filter.cc

Index: content/renderer/media/midi_message_filter.cc
diff --git a/content/renderer/media/midi_message_filter.cc b/content/renderer/media/midi_message_filter.cc
index cf950f73045ee6ef30d3af020029f7824acdfee2..7f70c0327178f98e11a47bac72520ca882cf72ec 100644
--- a/content/renderer/media/midi_message_filter.cc
+++ b/content/renderer/media/midi_message_filter.cc
@@ -24,7 +24,7 @@ namespace content {
 
 MidiMessageFilter::MidiMessageFilter(
     const scoped_refptr<base::MessageLoopProxy>& io_message_loop)
-    : channel_(NULL),
+    : sender_(NULL),
       io_message_loop_(io_message_loop),
       main_message_loop_(base::MessageLoopProxy::current()),
       next_available_id_(0),
@@ -35,10 +35,10 @@ MidiMessageFilter::~MidiMessageFilter() {}
 
 void MidiMessageFilter::Send(IPC::Message* message) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
-  if (!channel_) {
+  if (!sender_) {
     delete message;
   } else {
-    channel_->Send(message);
+    sender_->Send(message);
   }
 }
 
@@ -54,9 +54,9 @@ bool MidiMessageFilter::OnMessageReceived(const IPC::Message& message) {
   return handled;
 }
 
-void MidiMessageFilter::OnFilterAdded(IPC::Channel* channel) {
+void MidiMessageFilter::OnFilterAdded(IPC::Sender* sender) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
-  channel_ = channel;
+  sender_ = sender;
 }
 
 void MidiMessageFilter::OnFilterRemoved() {
@@ -64,12 +64,12 @@ void MidiMessageFilter::OnFilterRemoved() {
 
   // Once removed, a filter will not be used again.  At this time all
   // delegates must be notified so they release their reference.
-  OnChannelClosing();
+  OnSenderClosing();
 }
 
-void MidiMessageFilter::OnChannelClosing() {
+void MidiMessageFilter::OnSenderClosing() {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
-  channel_ = NULL;
+  sender_ = NULL;
 }
 
 void MidiMessageFilter::StartSession(blink::WebMIDIAccessorClient* client) {