Separate out IPC::Message::Sender and channel::Listener into a separate class.

content/browser/gpu/gpu_process_host_ui_shim.h

Index: content/browser/gpu/gpu_process_host_ui_shim.h
diff --git a/content/browser/gpu/gpu_process_host_ui_shim.h b/content/browser/gpu/gpu_process_host_ui_shim.h
index f99d53227e2a71bcd074065d86597b4b540b4e25..ec5678c4a405975ea0c3ce1768ca07c0841d80e3 100644
--- a/content/browser/gpu/gpu_process_host_ui_shim.h
+++ b/content/browser/gpu/gpu_process_host_ui_shim.h
@@ -21,6 +21,8 @@
 #include "content/common/content_export.h"
 #include "content/common/message_router.h"
 #include "content/public/common/gpu_info.h"
+#include "ipc/ipc_listener.h"
+#include "ipc/ipc_sender.h"
 
 struct GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params;
 struct GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params;
@@ -38,8 +40,8 @@ class Message;
 void RouteToGpuProcessHostUIShimTask(int host_id, const IPC::Message& msg);
 
 class GpuProcessHostUIShim
-    : public IPC::Channel::Listener,
-      public IPC::Channel::Sender,
+    : public IPC::Listener,
+      public IPC::Sender,
       public base::NonThreadSafe {
  public:
   // Create a GpuProcessHostUIShim with the given ID.  The object can be found
@@ -60,10 +62,10 @@ class GpuProcessHostUIShim
   // Return NULL if none has been created.
   CONTENT_EXPORT static GpuProcessHostUIShim* GetOneInstance();
 
-  // IPC::Channel::Sender implementation.
+  // IPC::Sender implementation.
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
-  // IPC::Channel::Listener implementation.
+  // IPC::Listener implementation.
   // The GpuProcessHost causes this to be called on the UI thread to
   // dispatch the incoming messages from the GPU process, which are
   // actually received on the IO thread.