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

content/common/np_channel_base.h

Index: content/common/np_channel_base.h
diff --git a/content/common/np_channel_base.h b/content/common/np_channel_base.h
index 8bacac3abd06ef8ee88331ab05fa44448963af25..f98704494ee6cb7d72bf668fb90a2e3113adffac 100644
--- a/content/common/np_channel_base.h
+++ b/content/common/np_channel_base.h
@@ -47,8 +47,8 @@ inline size_t hash_value(NPObject* const& ptr) {
 
 // Encapsulates an IPC channel between a renderer and another process. Used to
 // proxy access to NP objects.
-class NPChannelBase : public IPC::Channel::Listener,
-                      public IPC::Message::Sender,
+class NPChannelBase : public IPC::Listener,
+                      public IPC::Sender,
                       public base::RefCountedThreadSafe<NPChannelBase> {
  public:
 
@@ -58,8 +58,7 @@ class NPChannelBase : public IPC::Channel::Listener,
   // pass themselves for npobject).  However the latter don't control the
   // lifetime of this object because we don't want a leak of an NPObject to
   // keep the channel around longer than necessary.
-  void AddRoute(int route_id, IPC::Channel::Listener* listener,
-                NPObjectBase* npobject);
+  void AddRoute(int route_id, IPC::Listener* listener, NPObjectBase* npobject);
   void RemoveRoute(int route_id);
 
 
@@ -73,7 +72,7 @@ class NPChannelBase : public IPC::Channel::Listener,
   int GetExistingRouteForNPObjectStub(NPObject* npobject);
 
 
-  // IPC::Message::Sender implementation:
+  // IPC::Sender implementation:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   base::ProcessId peer_pid() { return channel_->peer_pid(); }
@@ -135,7 +134,7 @@ class NPChannelBase : public IPC::Channel::Listener,
   // Implemented by derived classes to handle control messages
   virtual bool OnControlMessageReceived(const IPC::Message& msg);
 
-  // IPC::Channel::Listener implementation:
+  // IPC::Listener implementation:
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void OnChannelConnected(int32 peer_pid) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;