Decouple IPC::MessageFilter from IPC::Channel

components/nacl/renderer/pnacl_translation_resource_host.cc

 // Copyright 2013 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 "pnacl_translation_resource_host.h"
 
 #include "components/nacl/common/nacl_host_messages.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 
 using ppapi::TrackedCallback;
 using ppapi::PpapiGlobals;
 
 PnaclTranslationResourceHost::CacheRequestInfo::CacheRequestInfo(
     PP_Bool* hit,
     PP_FileHandle* handle,
     scoped_refptr<TrackedCallback> cb)
     : is_hit(hit), file_handle(handle), callback(cb) {}
 
 PnaclTranslationResourceHost::CacheRequestInfo::~CacheRequestInfo() {}
 
 PnaclTranslationResourceHost::PnaclTranslationResourceHost(
     const scoped_refptr<base::MessageLoopProxy>& io_message_loop)
-    : io_message_loop_(io_message_loop), channel_(NULL) {}
+    : io_message_loop_(io_message_loop), sender_(NULL) {}
 
 PnaclTranslationResourceHost::~PnaclTranslationResourceHost() {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   CleanupCacheRequests();
 }
 
-void PnaclTranslationResourceHost::OnFilterAdded(IPC::Channel* channel) {
+void PnaclTranslationResourceHost::OnFilterAdded(IPC::Sender* sender) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
-  channel_ = channel;
+  sender_ = sender;
 }
 
 void PnaclTranslationResourceHost::OnFilterRemoved() {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
-  channel_ = NULL;
+  sender_ = NULL;
 }
 
 void PnaclTranslationResourceHost::OnChannelClosing() {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
-  channel_ = NULL;
+  sender_ = NULL;
 }
 
 bool PnaclTranslationResourceHost::OnMessageReceived(
     const IPC::Message& message) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PnaclTranslationResourceHost, message)
     IPC_MESSAGE_HANDLER(NaClViewMsg_NexeTempFileReply, OnNexeTempFileReply)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
@@ skipping 23 matching lines @@
 }
 
 void PnaclTranslationResourceHost::SendRequestNexeFd(
     int render_view_id,
     PP_Instance instance,
     const nacl::PnaclCacheInfo& cache_info,
     PP_Bool* is_hit,
     PP_FileHandle* file_handle,
     scoped_refptr<TrackedCallback> callback) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
-  if (!channel_ || !channel_->Send(new NaClHostMsg_NexeTempFileRequest(
-                       render_view_id, instance, cache_info))) {
+  if (!sender_ || !sender_->Send(new NaClHostMsg_NexeTempFileRequest(
+          render_view_id, instance, cache_info))) {
     PpapiGlobals::Get()->GetMainThreadMessageLoop()
         ->PostTask(FROM_HERE,
                    base::Bind(&TrackedCallback::Run,
                               callback,
                               static_cast<int32_t>(PP_ERROR_FAILED)));
     return;
   }
   pending_cache_requests_.insert(std::make_pair(
       instance, CacheRequestInfo(is_hit, file_handle, callback)));
 }
 
 void PnaclTranslationResourceHost::ReportTranslationFinished(
     PP_Instance instance,
     PP_Bool success) {
   DCHECK(PpapiGlobals::Get()->
          GetMainThreadMessageLoop()->BelongsToCurrentThread());
   io_message_loop_->PostTask(
       FROM_HERE,
       base::Bind(&PnaclTranslationResourceHost::SendReportTranslationFinished,
                  this,
                  instance,
                  success));
   return;
 }
 
 void PnaclTranslationResourceHost::SendReportTranslationFinished(
     PP_Instance instance,
     PP_Bool success) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
-  // If the channel is closed or we have been detached, we are probably shutting
+  // If the sender is closed or we have been detached, we are probably shutting
   // down, so just don't send anything.
-  if (!channel_)
+  if (!sender_)
     return;
   DCHECK(pending_cache_requests_.count(instance) == 0);
-  channel_->Send(new NaClHostMsg_ReportTranslationFinished(instance,
-                                                           PP_ToBool(success)));
+  sender_->Send(new NaClHostMsg_ReportTranslationFinished(instance,
+                                                          PP_ToBool(success)));
 }
 
 void PnaclTranslationResourceHost::OnNexeTempFileReply(
     PP_Instance instance,
     bool is_hit,
     IPC::PlatformFileForTransit file) {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   base::File base_file = IPC::PlatformFileForTransitToFile(file);
   CacheRequestInfoMap::iterator it = pending_cache_requests_.find(instance);
   int32_t status = PP_ERROR_FAILED;
@@ skipping 19 matching lines @@
 
 void PnaclTranslationResourceHost::CleanupCacheRequests() {
   DCHECK(io_message_loop_->BelongsToCurrentThread());
   for (CacheRequestInfoMap::iterator it = pending_cache_requests_.begin();
        it != pending_cache_requests_.end();
        ++it) {
     it->second.callback->PostAbort();
   }
   pending_cache_requests_.clear();
 }