Decouple IPC::MessageFilter from IPC::Channel

ipc/ipc_channel_proxy_unittest.cc

Index: ipc/ipc_channel_proxy_unittest.cc
diff --git a/ipc/ipc_channel_proxy_unittest.cc b/ipc/ipc_channel_proxy_unittest.cc
index 20e42e30224efbb57dfd8970472c18d714983816..346f43eca4366db7b20d5c7f10354894f3fa8d0c 100644
--- a/ipc/ipc_channel_proxy_unittest.cc
+++ b/ipc/ipc_channel_proxy_unittest.cc
@@ -143,26 +143,25 @@ class MessageCountFilter : public IPC::MessageFilter {
         last_filter_event_(NONE),
         message_filtering_enabled_(false) {}
 
-  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE {
-    EXPECT_TRUE(channel);
+  virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE {
+    EXPECT_TRUE(sender);
     EXPECT_EQ(NONE, last_filter_event_);
     last_filter_event_ = FILTER_ADDED;
   }
 
-  virtual void OnChannelConnected(int32_t peer_pid) OVERRIDE {
+  virtual void OnSenderConnected() OVERRIDE {
     EXPECT_EQ(FILTER_ADDED, last_filter_event_);
-    EXPECT_NE(static_cast<int32_t>(base::kNullProcessId), peer_pid);
     last_filter_event_ = CHANNEL_CONNECTED;
   }
 
-  virtual void OnChannelError() OVERRIDE {
+  virtual void OnSenderError() OVERRIDE {
     EXPECT_EQ(CHANNEL_CONNECTED, last_filter_event_);
     last_filter_event_ = CHANNEL_ERROR;
   }
 
-  virtual void OnChannelClosing() OVERRIDE {
-    // We may or may not have gotten OnChannelError; if not, the last event has
-    // to be OnChannelConnected.
+  virtual void OnSenderClosing() OVERRIDE {
+    // We may or may not have gotten OnSenderError; if not, the last event has
+    // to be OnSenderConnected.
     if (last_filter_event_ != CHANNEL_ERROR)
       EXPECT_EQ(CHANNEL_CONNECTED, last_filter_event_);
     last_filter_event_ = CHANNEL_CLOSING;