Move NPObjectBase and PluginChannelBase from content/plugin to content/common

Also rename PluginChannelBase to NPChannelBase, fix variable naming to be agnostic of plugins, and fix a comment in NPChannelBase.

This change is refactoring only and introduces no change in behaviour.

BUG=96703

Review URL: http://codereview.chromium.org/7891003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101874 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/content/plugin/plugin_channel.h b/content/plugin/plugin_channel.h
index 6a5bb74..87afb8c 100644
--- a/content/plugin/plugin_channel.h
+++ b/content/plugin/plugin_channel.h
@@ -11,7 +11,7 @@
 #include "base/memory/scoped_handle.h"
 #include "base/process.h"
 #include "build/build_config.h"
-#include "content/plugin/plugin_channel_base.h"
+#include "content/common/np_channel_base.h"
 #include "content/plugin/webplugin_delegate_stub.h"
 
 namespace base {
@@ -20,7 +20,7 @@ class WaitableEvent;
 
 // Encapsulates an IPC channel between the plugin process and one renderer
 // process.  On the renderer side there's a corresponding PluginChannelHost.
-class PluginChannel : public PluginChannelBase {
+class PluginChannel : public NPChannelBase {
  public:
   // Get a new PluginChannel object for the current process to talk to the
   // given renderer process. The renderer ID is an opaque unique ID generated
@@ -63,7 +63,7 @@ class PluginChannel : public PluginChannelBase {
 
   virtual void CleanUp();
 
-  // Overrides PluginChannelBase::Init.
+  // Overrides NPChannelBase::Init.
   virtual bool Init(base::MessageLoopProxy* ipc_message_loop,
                    bool create_pipe_now);
 
@@ -75,7 +75,7 @@ class PluginChannel : public PluginChannelBase {
 
   virtual bool OnControlMessageReceived(const IPC::Message& msg);
 
-  static PluginChannelBase* ClassFactory() { return new PluginChannel(); }
+  static NPChannelBase* ClassFactory() { return new PluginChannel(); }
 
   void OnCreateInstance(const std::string& mime_type, int* instance_id);
   void OnDestroyInstance(int instance_id, IPC::Message* reply_msg);