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

content/common/gpu/gpu_channel_manager.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.
 
 #ifndef CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_
 #define CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_
 #pragma once
 
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop_proxy.h"
 #include "build/build_config.h"
 #include "content/common/gpu/gpu_memory_manager.h"
-#include "ipc/ipc_channel.h"
-#include "ipc/ipc_message.h"
+#include "ipc/ipc_listener.h"
+#include "ipc/ipc_sender.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace base {
 class WaitableEvent;
 }
 
 namespace gfx {
 class GLShareGroup;
 }
 
@@ skipping 13 matching lines @@
 struct GPUCreateCommandBufferConfig;
 class SyncPointManager;
 
 // A GpuChannelManager is a thread responsible for issuing rendering commands
 // managing the lifetimes of GPU channels and forwarding IPC requests from the
 // browser process to them based on the corresponding renderer ID.
 //
 // A GpuChannelManager can also be hosted in the browser process in single
 // process or in-process GPU modes. In this case there is no corresponding
 // GpuChildThread and this is the reason the GpuChildThread is referenced via
-// a pointer to IPC::Message::Sender, which can be implemented by other hosts
-// to send IPC messages to the browser process IO thread on the
-// GpuChannelManager's behalf.
-class GpuChannelManager : public IPC::Channel::Listener,
-                          public IPC::Message::Sender,
+// a pointer to IPC::Sender, which can be implemented by other hosts to send
+// IPC messages to the browser process IO thread on the GpuChannelManager's
+// behalf.
+class GpuChannelManager : public IPC::Listener,
+                          public IPC::Sender,
                           public GpuMemoryManagerClient {
  public:
   GpuChannelManager(ChildThread* gpu_child_thread,
                     GpuWatchdog* watchdog,
                     base::MessageLoopProxy* io_message_loop,
                     base::WaitableEvent* shutdown_event);
   virtual ~GpuChannelManager();
 
   // Remove the channel for a particular renderer.
   void RemoveChannel(int client_id);
 
   // Listener overrides.
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   // Sender overrides.
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // GpuMemoryManagerClient overrides.
   virtual void AppendAllCommandBufferStubs(
       std::vector<GpuCommandBufferStubBase*>& stubs) OVERRIDE;
 
   void LoseAllContexts();
 
   base::WeakPtrFactory<GpuChannelManager> weak_factory_;
 
   int GenerateRouteID();
-  void AddRoute(int32 routing_id, IPC::Channel::Listener* listener);
+  void AddRoute(int32 routing_id, IPC::Listener* listener);
   void RemoveRoute(int32 routing_id);
 
   GpuMemoryManager* gpu_memory_manager() { return &gpu_memory_manager_; }
 
   GpuChannel* LookupChannel(int32 client_id);
 
   SyncPointManager* sync_point_manager() { return sync_point_manager_; }
 
  private:
   // Message handlers.
@@ skipping 23 matching lines @@
   scoped_refptr<gfx::GLShareGroup> share_group_;
   scoped_refptr<gpu::gles2::MailboxManager> mailbox_manager_;
   GpuMemoryManager gpu_memory_manager_;
   GpuWatchdog* watchdog_;
   scoped_refptr<SyncPointManager> sync_point_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannelManager);
 };
 
 #endif  // CONTENT_COMMON_GPU_GPU_CHANNEL_MANAGER_H_