Revert "Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

webkit/glue/plugins/plugin_instance.h

Index: webkit/glue/plugins/plugin_instance.h
diff --git a/webkit/plugins/npapi/plugin_instance.h b/webkit/glue/plugins/plugin_instance.h
similarity index 96%
rename from webkit/plugins/npapi/plugin_instance.h
rename to webkit/glue/plugins/plugin_instance.h
index 98a58381126af1472e9ac64cf44aecf7cd8a169a..fa0320e6440b2422f71a86d722534d81194951d5 100644
--- a/webkit/plugins/npapi/plugin_instance.h
+++ b/webkit/glue/plugins/plugin_instance.h
@@ -5,8 +5,8 @@
 // TODO: Need to deal with NPAPI's NPSavedData.
 //       I haven't seen plugins use it yet.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_INSTANCE_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGIN_INSTANCE_H_
+#ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_INSTANCE_H__
+#define WEBKIT_GLUE_PLUGIN_PLUGIN_INSTANCE_H__
 
 #include <map>
 #include <stack>
@@ -26,17 +26,18 @@
 
 class MessageLoop;
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
+class WebPlugin;
+class WebPluginResourceClient;
+}
 
+namespace NPAPI
+{
 class PluginLib;
 class PluginHost;
 class PluginStream;
 class PluginStreamUrl;
 class PluginDataStream;
-class WebPlugin;
-class WebPluginResourceClient;
-
 #if defined(OS_MACOSX)
 class ScopedCurrentPluginEvent;
 #endif
@@ -95,15 +96,15 @@ class PluginInstance : public base::RefCountedThreadSafe<PluginInstance> {
   void set_transparent(bool value) { transparent_ = value; }
 
   // Get/Set the WebPlugin associated with this instance
-  WebPlugin* webplugin() { return webplugin_; }
-  void set_web_plugin(WebPlugin* webplugin) {
+  webkit_glue::WebPlugin* webplugin() { return webplugin_; }
+  void set_web_plugin(webkit_glue::WebPlugin* webplugin) {
     webplugin_ = webplugin;
   }
 
   // Get the mimeType for this plugin stream
   const std::string &mime_type() { return mime_type_; }
 
-  PluginLib* plugin_lib() { return plugin_; }
+  NPAPI::PluginLib* plugin_lib() { return plugin_; }
 
 #if defined(OS_MACOSX)
   // Get/Set the Mac NPAPI drawing and event models
@@ -147,7 +148,7 @@ class PluginInstance : public base::RefCountedThreadSafe<PluginInstance> {
 
   // Returns the WebPluginResourceClient object for a stream that has become
   // seekable.
-  WebPluginResourceClient* GetRangeRequest(int id);
+  webkit_glue::WebPluginResourceClient* GetRangeRequest(int id);
 
   // Have the plugin create it's script object.
   NPObject *GetPluginScriptableObject();
@@ -283,7 +284,7 @@ class PluginInstance : public base::RefCountedThreadSafe<PluginInstance> {
   // the possiblity of conforming to it (http://b/issue?id=936667). We
   // could also log a bug with Real, which would save the effort.
   uint8                                    zero_padding_[96];
-  scoped_refptr<PluginLib>                 plugin_;
+  scoped_refptr<NPAPI::PluginLib>          plugin_;
   NPP                                      npp_;
   scoped_refptr<PluginHost>                host_;
   NPPluginFuncs*                           npp_functions_;
@@ -291,7 +292,7 @@ class PluginInstance : public base::RefCountedThreadSafe<PluginInstance> {
   gfx::PluginWindowHandle                  window_handle_;
   bool                                     windowless_;
   bool                                     transparent_;
-  WebPlugin*                               webplugin_;
+  webkit_glue::WebPlugin*                  webplugin_;
   std::string                              mime_type_;
   GURL                                     get_url_;
   intptr_t                                 get_notify_data_;
@@ -369,7 +370,6 @@ class ScopedCurrentPluginEvent {
 };
 #endif
 
-}  // namespace npapi
-}  // namespace webkit
+} // namespace NPAPI
 
-#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_INSTANCE_H_
+#endif  // WEBKIT_GLUE_PLUGIN_PLUGIN_INSTANCE_H__