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

content/common/np_channel_base.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_NP_CHANNEL_BASE_H_
 #define CONTENT_COMMON_NP_CHANNEL_BASE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 29 matching lines @@
 template<>
 inline size_t hash_value(NPObject* const& ptr) {
   return hash_value(reinterpret_cast<size_t>(ptr));
 }
 
 }  // namespace stdext
 #endif // COMPILER
 
 // 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:
 
   // WebPlugin[Delegate] call these on construction and destruction to setup
   // the routing and manage lifetime of this object (they pass NULL for
   // npobject). These are also called by NPObjectProxy and NPObjectStub (which
   // 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);
 
 
   void AddMappingForNPObjectProxy(int route_id, NPObject* object);
   void RemoveMappingForNPObjectProxy(int route_id);
 
   void AddMappingForNPObjectStub(int route_id, NPObject* object);
   void RemoveMappingForNPObjectStub(int route_id, NPObject* object);
 
   NPObject* GetExistingNPObjectProxy(int route_id);
   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(); }
   IPC::ChannelHandle channel_handle() const { return channel_handle_; }
 
   // Returns the number of open NPObject channels in this process.
   static int Count();
 
   // Returns a new route id.
   virtual int GenerateRouteID() = 0;
@@ skipping 41 matching lines @@
   static void Broadcast(IPC::Message* message);
 
   // Called on the worker thread
   NPChannelBase();
 
   virtual void CleanUp() { }
 
   // 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;
 
   void set_send_unblocking_only_during_unblock_dispatch() {
     send_unblocking_only_during_unblock_dispatch_ = true;
   }
 
   virtual bool Init(base::MessageLoopProxy* ipc_message_loop,
                     bool create_pipe_now,
@@ skipping 45 matching lines @@
   // a result of a sync call from the renderer must unblock the renderer.  We
   // additionally have to do this for async messages from the renderer that
   // have the unblock flag set, since they could be followed by a sync message
   // that won't get dispatched until the call to the renderer is complete.
   bool send_unblocking_only_during_unblock_dispatch_;
 
   DISALLOW_COPY_AND_ASSIGN(NPChannelBase);
 };
 
 #endif  // CONTENT_COMMON_NP_CHANNEL_BASE_H_