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

content/common/npobject_stub.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.
 //
 // A class that receives IPC messages from an NPObjectProxy and calls the real
 // NPObject.
 
 #ifndef CONTENT_COMMON_NPOBJECT_STUB_H_
 #define CONTENT_COMMON_NPOBJECT_STUB_H_
 #pragma once
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.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 "ui/gfx/native_widget_types.h"
 
 class NPChannelBase;
 struct NPIdentifier_Param;
 struct NPObject;
 struct NPVariant_Param;
 
 // This wraps an NPObject and converts IPC messages from NPObjectProxy to calls
 // to the object.  The results are marshalled back.  See npobject_proxy.h for
 // more information.
-class NPObjectStub : public IPC::Channel::Listener,
-                     public IPC::Message::Sender,
+class NPObjectStub : public IPC::Listener,
+                     public IPC::Sender,
                      public base::SupportsWeakPtr<NPObjectStub>,
                      public NPObjectBase {
  public:
   NPObjectStub(NPObject* npobject,
                NPChannelBase* channel,
                int route_id,
                gfx::NativeViewId containing_window,
                const GURL& page_url);
   virtual ~NPObjectStub();
 
   // Schedules tear-down of this stub.  The underlying NPObject reference is
   // released, and further invokations form the IPC channel will fail once this
   // call has returned.  Deletion of the stub is deferred to the main loop, in
   // case it is touched as the stack unwinds.  DeleteSoon() is safe to call
   // more than once, until control returns to the main loop.
   void DeleteSoon();
 
-  // IPC::Message::Sender implementation:
+  // IPC::Sender implementation:
   virtual bool Send(IPC::Message* msg) OVERRIDE;
 
   // NPObjectBase implementation.
   virtual NPObject* GetUnderlyingNPObject() OVERRIDE;
-  virtual IPC::Channel::Listener* GetChannelListener() OVERRIDE;
+  virtual IPC::Listener* GetChannelListener() OVERRIDE;
 
  private:
-  // IPC::Channel::Listener implementation:
+  // IPC::Listener implementation:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void OnChannelError() OVERRIDE;
 
   // message handlers
   void OnRelease(IPC::Message* reply_msg);
   void OnHasMethod(const NPIdentifier_Param& name,
                    bool* result);
   void OnInvoke(bool is_default,
                 const NPIdentifier_Param& method,
                 const std::vector<NPVariant_Param>& args,
@@ skipping 20 matching lines @@
   NPObject* npobject_;
   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_STUB_H_