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

content/common/gpu/client/gpu_channel_host.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_CLIENT_GPU_CHANNEL_HOST_H_
 #define CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 29 matching lines @@
 }
 
 namespace IPC {
 class SyncMessageFilter;
 }
 
 struct GpuListenerInfo {
   GpuListenerInfo();
   ~GpuListenerInfo();
 
-  base::WeakPtr<IPC::Channel::Listener> listener;
+  base::WeakPtr<IPC::Listener> listener;
   scoped_refptr<base::MessageLoopProxy> loop;
 };
 
 class CONTENT_EXPORT GpuChannelHostFactory {
  public:
   virtual ~GpuChannelHostFactory() {}
 
   virtual bool IsMainThread() = 0;
   virtual bool IsIOThread() = 0;
   virtual MessageLoop* GetMainLoop() = 0;
   virtual scoped_refptr<base::MessageLoopProxy> GetIOLoopProxy() = 0;
   virtual base::WaitableEvent* GetShutDownEvent() = 0;
   virtual scoped_ptr<base::SharedMemory> AllocateSharedMemory(uint32 size) = 0;
   virtual int32 CreateViewCommandBuffer(
       int32 surface_id, const GPUCreateCommandBufferConfig& init_params) = 0;
   virtual GpuChannelHost* EstablishGpuChannelSync(
       content::CauseForGpuLaunch) = 0;
 };
 
 // Encapsulates an IPC channel between the client and one GPU process.
 // On the GPU process side there's a corresponding GpuChannel.
-class GpuChannelHost : public IPC::Message::Sender,
+class GpuChannelHost : public IPC::Sender,
                        public base::RefCountedThreadSafe<GpuChannelHost> {
  public:
   enum State {
     // Not yet connected.
     kUnconnected,
     // Ready to use.
     kConnected,
     // An error caused the host to become disconnected. Recreate channel to
     // reestablish connection.
     kLost
@@ skipping 11 matching lines @@
 
   // Change state to kLost.
   void SetStateLost();
 
   // The GPU stats reported by the GPU process.
   void set_gpu_info(const content::GPUInfo& gpu_info);
   const content::GPUInfo& gpu_info() const;
 
   void OnChannelError();
 
-  // IPC::Message::Sender implementation:
+  // IPC::Sender implementation:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // Create and connect to a command buffer in the GPU process.
   CommandBufferProxy* CreateViewCommandBuffer(
       int32 surface_id,
       CommandBufferProxy* share_group,
       const std::string& allowed_extensions,
       const std::vector<int32>& attribs,
       const GURL& active_url,
       gfx::GpuPreference gpu_preference);
@@ skipping 11 matching lines @@
   // Returned pointer is owned by the CommandBufferProxy for |route_id|.
   GpuVideoDecodeAcceleratorHost* CreateVideoDecoder(
       int command_buffer_route_id,
       media::VideoCodecProfile profile,
       media::VideoDecodeAccelerator::Client* client);
 
   // Destroy a command buffer created by this channel.
   void DestroyCommandBuffer(CommandBufferProxy* command_buffer);
 
   // Add a route for the current message loop.
-  void AddRoute(int route_id, base::WeakPtr<IPC::Channel::Listener> listener);
+  void AddRoute(int route_id, base::WeakPtr<IPC::Listener> listener);
   void RemoveRoute(int route_id);
 
   GpuChannelHostFactory* factory() const { return factory_; }
   int gpu_host_id() const { return gpu_host_id_; }
   base::ProcessId gpu_pid() const { return channel_->peer_pid(); }
   int client_id() const { return client_id_; }
 
  private:
   friend class base::RefCountedThreadSafe<GpuChannelHost>;
   virtual ~GpuChannelHost();
 
   // A filter used internally to route incoming messages from the IO thread
   // to the correct message loop.
   class MessageFilter : public IPC::ChannelProxy::MessageFilter {
    public:
     explicit MessageFilter(GpuChannelHost* parent);
 
     void AddRoute(int route_id,
-                  base::WeakPtr<IPC::Channel::Listener> listener,
+                  base::WeakPtr<IPC::Listener> listener,
                   scoped_refptr<base::MessageLoopProxy> loop);
     void RemoveRoute(int route_id);
 
     // IPC::ChannelProxy::MessageFilter implementation:
     virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
     virtual void OnChannelError() OVERRIDE;
 
    private:
     virtual ~MessageFilter();
 
@@ skipping 22 matching lines @@
   // for calls from contexts that may live on the compositor or main thread.
   mutable base::Lock context_lock_;
 
   // A filter for sending messages from thread other than the main thread.
   scoped_refptr<IPC::SyncMessageFilter> sync_filter_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuChannelHost);
 };
 
 #endif  // CONTENT_COMMON_GPU_CLIENT_GPU_CHANNEL_HOST_H_