Decouple IPC::MessageFilter from IPC::Channel

ipc/ipc_channel_proxy.cc

 // Copyright (c) 2012 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 "ipc/ipc_channel_proxy.h"
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
@@ skipping 93 matching lines @@
   OnAddFilter();
 
   // See above comment about using listener_task_runner_ here.
   listener_task_runner_->PostTask(
       FROM_HERE, base::Bind(&Context::OnDispatchConnected, this));
 }
 
 // Called on the IPC::Channel thread
 void ChannelProxy::Context::OnChannelError() {
   for (size_t i = 0; i < filters_.size(); ++i)
-    filters_[i]->OnChannelError();
+    filters_[i]->OnSenderError();
 
   // See above comment about using listener_task_runner_ here.
   listener_task_runner_->PostTask(
       FROM_HERE, base::Bind(&Context::OnDispatchError, this));
 }
 
 // Called on the IPC::Channel thread
 void ChannelProxy::Context::OnChannelOpened() {
   DCHECK(channel_ != NULL);
 
@@ skipping 11 matching lines @@
 }
 
 // Called on the IPC::Channel thread
 void ChannelProxy::Context::OnChannelClosed() {
   // It's okay for IPC::ChannelProxy::Close to be called more than once, which
   // would result in this branch being taken.
   if (!channel_)
     return;
 
   for (size_t i = 0; i < filters_.size(); ++i) {
-    filters_[i]->OnChannelClosing();
+    filters_[i]->OnSenderClosing();
     filters_[i]->OnFilterRemoved();
   }
 
   // We don't need the filters anymore.
   message_filter_router_->Clear();
   filters_.clear();
   // We don't need the lock, because at this point, the listener thread can't
   // access it any more.
   pending_filters_.clear();
 
@@ skipping 35 matching lines @@
   }
 
   for (size_t i = 0; i < new_filters.size(); ++i) {
     filters_.push_back(new_filters[i]);
 
     message_filter_router_->AddFilter(new_filters[i].get());
 
     // The channel has already been created and connected, so we need to
     // inform the filters right now.
     new_filters[i]->OnFilterAdded(channel_.get());
-    new_filters[i]->OnChannelConnected(peer_pid_);
+    new_filters[i]->OnSenderConnected();
   }
 }
 
 // Called on the IPC::Channel thread
 void ChannelProxy::Context::OnRemoveFilter(MessageFilter* filter) {
   if (peer_pid_ == base::kNullProcessId) {
     // The channel is not yet connected, so any filters are still pending.
     base::AutoLock auto_lock(pending_filters_lock_);
     for (size_t i = 0; i < pending_filters_.size(); ++i) {
       if (pending_filters_[i].get() == filter) {
@@ skipping 221 matching lines @@
   Channel* channel = context_.get()->channel_.get();
   // Channel must have been created first.
   DCHECK(channel) << context_.get()->channel_id_;
   return channel->TakeClientFileDescriptor();
 }
 #endif
 
 //-----------------------------------------------------------------------------
 
 }  // namespace IPC