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

content/common/npobject_proxy.h

 // Copyright (c) 2011 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.
 //
 // A proxy for NPObject that sends all calls to the object to an NPObjectStub
 // running in a different process.
 
 #ifndef CONTENT_COMMON_NPOBJECT_PROXY_H_
 #define CONTENT_COMMON_NPOBJECT_PROXY_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
 #include "content/common/npobject_base.h"
 #include "googleurl/src/gurl.h"
-#include "ipc/ipc_channel.h"
+#include "ipc/ipc_listener.h"
+#include "ipc/ipc_sender.h"
 #include "third_party/npapi/bindings/npruntime.h"
 #include "ui/gfx/native_widget_types.h"
 
 class NPChannelBase;
 struct NPObject;
 
 // When running a plugin in a different process from the renderer, we need to
 // proxy calls to NPObjects across process boundaries.  This happens both ways,
 // as a plugin can get an NPObject for the window, and a page can get an
 // NPObject for the plugin.  In the process that interacts with the NPobject we
 // give it an NPObjectProxy instead.  All calls to it are sent across an IPC
 // channel (specifically, a NPChannelBase).  The NPObjectStub on the other
 // side translates the IPC messages into calls to the actual NPObject, and
 // returns the marshalled result.
-class NPObjectProxy : public IPC::Channel::Listener,
-                      public IPC::Message::Sender,
+class NPObjectProxy : public IPC::Listener,
+                      public IPC::Sender,
                       public NPObjectBase {
  public:
   virtual ~NPObjectProxy();
 
   static NPObject* Create(NPChannelBase* channel,
                           int route_id,
                           gfx::NativeViewId containing_window,
                           const GURL& page_url);
 
-  // IPC::Message::Sender implementation:
+  // IPC::Sender implementation:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
   int route_id() { return route_id_; }
   NPChannelBase* channel() { return channel_; }
 
   // The next 9 functions are called on NPObjects from the plugin and browser.
   static bool NPHasMethod(NPObject *obj,
                           NPIdentifier name);
   static bool NPInvoke(NPObject *obj,
                        NPIdentifier name,
                        const NPVariant *args,
@@ skipping 34 matching lines @@
                               const NPVariant *args,
                               uint32_t arg_count,
                               NPVariant *result);
 
   static NPObjectProxy* GetProxy(NPObject* object);
   static const NPClass* npclass() { return &npclass_proxy_; }
 
   // NPObjectBase implementation.
   virtual NPObject* GetUnderlyingNPObject() OVERRIDE;
 
-  virtual IPC::Channel::Listener* GetChannelListener() OVERRIDE;
+  virtual IPC::Listener* GetChannelListener() OVERRIDE;
 
  private:
   NPObjectProxy(NPChannelBase* channel,
                 int route_id,
                 gfx::NativeViewId containing_window,
                 const GURL& page_url);
 
-  // IPC::Channel::Listener implementation:
+  // IPC::Listener implementation:
   virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
   static NPObject* NPAllocate(NPP, NPClass*);
   static void NPDeallocate(NPObject* npObj);
 
   // This function is only caled on NPObjects from the plugin.
   static void NPPInvalidate(NPObject *obj);
   static NPClass npclass_proxy_;
 
   scoped_refptr<NPChannelBase> channel_;
   int route_id_;
   gfx::NativeViewId containing_window_;
 
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 };
 
 #endif  // CONTENT_COMMON_NPOBJECT_PROXY_H_