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

content/common/message_router.cc

Index: content/common/message_router.cc
diff --git a/content/common/message_router.cc b/content/common/message_router.cc
index b019843ec63d6a005ad24304acf2ffaf2a03e4f7..92523fae17a025d3fc92c4c8727eb4942d34a6cb 100644
--- a/content/common/message_router.cc
+++ b/content/common/message_router.cc
@@ -4,6 +4,8 @@
 
 #include "content/common/message_router.h"
 
+#include "ipc/ipc_message.h"
+
 MessageRouter::MessageRouter() {
 }
 
@@ -22,8 +24,7 @@ bool MessageRouter::Send(IPC::Message* msg) {
   return false;
 }
 
-void MessageRouter::AddRoute(int32 routing_id,
-                             IPC::Channel::Listener* listener) {
+void MessageRouter::AddRoute(int32 routing_id, IPC::Listener* listener) {
   routes_.AddWithID(listener, routing_id);
 }
 
@@ -39,7 +40,7 @@ bool MessageRouter::OnMessageReceived(const IPC::Message& msg) {
 }
 
 bool MessageRouter::RouteMessage(const IPC::Message& msg) {
-  IPC::Channel::Listener* listener = ResolveRoute(msg.routing_id());
+  IPC::Listener* listener = ResolveRoute(msg.routing_id());
   if (!listener)
     return false;
 
@@ -47,6 +48,6 @@ bool MessageRouter::RouteMessage(const IPC::Message& msg) {
   return true;
 }
 
-IPC::Channel::Listener* MessageRouter::ResolveRoute(int32 routing_id) {
+IPC::Listener* MessageRouter::ResolveRoute(int32 routing_id) {
   return routes_.Lookup(routing_id);
 }