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

ppapi/proxy/plugin_message_filter.cc

 // Copyright (c) 2011 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 "ppapi/proxy/plugin_message_filter.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "ipc/ipc_channel.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/resource_message_params.h"
 #include "ppapi/proxy/resource_reply_thread_registrar.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/proxy_lock.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/resource_tracker.h"
 
 namespace ppapi {
 namespace proxy {
 
 PluginMessageFilter::PluginMessageFilter(
     std::set<PP_Instance>* seen_instance_ids,
     scoped_refptr<ResourceReplyThreadRegistrar> registrar)
     : seen_instance_ids_(seen_instance_ids),
       resource_reply_thread_registrar_(registrar),
-      sender_(NULL) {
+      channel_(NULL) {
 }
 
 PluginMessageFilter::~PluginMessageFilter() {
 }
 
-void PluginMessageFilter::OnFilterAdded(IPC::Sender* sender) {
-  sender_ = sender;
+void PluginMessageFilter::OnFilterAdded(IPC::Channel* channel) {
+  channel_ = channel;
 }
 
 void PluginMessageFilter::OnFilterRemoved() {
-  sender_ = NULL;
+  channel_ = NULL;
 }
 
 bool PluginMessageFilter::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PluginMessageFilter, message)
     IPC_MESSAGE_HANDLER(PpapiMsg_ReserveInstanceId, OnMsgReserveInstanceId)
     IPC_MESSAGE_HANDLER(PpapiPluginMsg_ResourceReply, OnMsgResourceReply)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 bool PluginMessageFilter::Send(IPC::Message* msg) {
-  if (sender_)
-    return sender_->Send(msg);
+  if (channel_)
+    return channel_->Send(msg);
   delete msg;
   return false;
 }
 
 // static
 void PluginMessageFilter::DispatchResourceReplyForTest(
     const ResourceMessageReplyParams& reply_params,
     const IPC::Message& nested_msg) {
   DispatchResourceReply(reply_params, nested_msg);
 }
@@ skipping 39 matching lines @@
     DVLOG_IF(1, reply_params.sequence() != 0)
         << "Pepper resource reply message received but the resource doesn't "
            "exist (probably has been destroyed).";
     return;
   }
   resource->OnReplyReceived(reply_params, nested_msg);
 }
 
 }  // namespace proxy
 }  // namespace ppapi