Use IPC::Sender and IPC::Listener in content.

content/common/child_thread.h

Index: content/common/child_thread.h
diff --git a/content/common/child_thread.h b/content/common/child_thread.h
index e12a3e177249e5fd1e8115cddb7b639bde2aad57..fa39ebe5a59716df6c96bc9f6105552b3c2ad685 100644
--- a/content/common/child_thread.h
+++ b/content/common/child_thread.h
@@ -30,8 +30,7 @@ class WebFrame;
 }
 
 // The main thread of a child process derives from this class.
-class CONTENT_EXPORT ChildThread : public IPC::Channel::Listener,
-                                   public IPC::Message::Sender {
+class CONTENT_EXPORT ChildThread : public IPC::Listener, public IPC::Sender {
  public:
   // Creates the thread.
   ChildThread();
@@ -39,14 +38,14 @@ class CONTENT_EXPORT ChildThread : public IPC::Channel::Listener,
   explicit ChildThread(const std::string& channel_name);
   virtual ~ChildThread();
 
-  // IPC::Message::Sender implementation:
+  // IPC::Sender implementation:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // See documentation on MessageRouter for AddRoute and RemoveRoute
-  void AddRoute(int32 routing_id, IPC::Channel::Listener* listener);
+  void AddRoute(int32 routing_id, IPC::Listener* listener);
   void RemoveRoute(int32 routing_id);
 
-  IPC::Channel::Listener* ResolveRoute(int32 routing_id);
+  IPC::Listener* ResolveRoute(int32 routing_id);
 
   IPC::SyncChannel* channel() { return channel_.get(); }
 
@@ -111,7 +110,7 @@ class CONTENT_EXPORT ChildThread : public IPC::Channel::Listener,
  private:
   void Init();
 
-  // IPC::Channel::Listener implementation:
+  // IPC::Listener implementation:
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;