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

ipc/ipc_channel_proxy_unittest.cc

 // Copyright 2014 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 "build/build_config.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/pickle.h"
 #include "base/threading/thread.h"
 #include "ipc/ipc_message.h"
@@ skipping 125 matching lines @@
         last_filter_event_(NONE),
         message_filtering_enabled_(false) {}
 
   MessageCountFilter(uint32 supported_message_class)
       : messages_received_(0),
         supported_message_class_(supported_message_class),
         is_global_filter_(false),
         last_filter_event_(NONE),
         message_filtering_enabled_(false) {}
 
-  virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE {
-    EXPECT_TRUE(sender);
+  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE {
+    EXPECT_TRUE(channel);
     EXPECT_EQ(NONE, last_filter_event_);
     last_filter_event_ = FILTER_ADDED;
   }
 
   virtual void OnChannelConnected(int32_t peer_pid) OVERRIDE {
     EXPECT_EQ(FILTER_ADDED, last_filter_event_);
     EXPECT_NE(static_cast<int32_t>(base::kNullProcessId), peer_pid);
     last_filter_event_ = CHANNEL_CONNECTED;
   }
 
@@ skipping 274 matching lines @@
       IPCTestBase::GetChannelName("ChannelProxyClient"),
       &listener));
   CHECK(channel->Connect());
   listener.Init(channel.get());
 
   base::MessageLoop::current()->Run();
   return 0;
 }
 
 }  // namespace