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

content/renderer/p2p/socket_dispatcher.h

 // 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.
 
 // P2PSocketDispatcher is a per-renderer object that dispatchers all
 // P2P messages received from the browser and relays all P2P messages
 // sent to the browser. P2PSocketClient instances register themselves
 // with the dispatcher using RegisterClient() and UnregisterClient().
 //
 // Relationship of classes.
@@ skipping 56 matching lines @@
 
  private:
   friend class P2PAsyncAddressResolver;
   friend class P2PSocketClientImpl;
 
   // Send a message asynchronously.
   virtual void Send(IPC::Message* message);
 
   // IPC::MessageFilter override. Called on IO thread.
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
-  virtual void OnFilterAdded(IPC::Sender* sender) OVERRIDE;
+  virtual void OnFilterAdded(IPC::Channel* channel) OVERRIDE;
   virtual void OnFilterRemoved() OVERRIDE;
   virtual void OnChannelClosing() OVERRIDE;
 
   // Returns the IO message loop.
   base::MessageLoopProxy* message_loop();
 
   // Called by P2PSocketClient.
   int RegisterClient(P2PSocketClientImpl* client);
   void UnregisterClient(int id);
   void SendP2PMessage(IPC::Message* msg);
@@ skipping 18 matching lines @@
 
   scoped_refptr<base::MessageLoopProxy> message_loop_;
   IDMap<P2PSocketClientImpl> clients_;
 
   IDMap<P2PAsyncAddressResolver> host_address_requests_;
 
   bool network_notifications_started_;
   scoped_refptr<ObserverListThreadSafe<NetworkListObserver> >
       network_list_observers_;
 
-  IPC::Sender* sender_;
+  IPC::Channel* channel_;
 
   DISALLOW_COPY_AND_ASSIGN(P2PSocketDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_P2P_SOCKET_DISPATCHER_H_