Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put...

webkit/plugins/npapi/plugin_instance.h

Index: webkit/plugins/npapi/plugin_instance.h
===================================================================
--- webkit/plugins/npapi/plugin_instance.h	(revision 0)
+++ webkit/plugins/npapi/plugin_instance.h	(working copy)
@@ -5,8 +5,8 @@
 // TODO: Need to deal with NPAPI's NPSavedData.
 //       I haven't seen plugins use it yet.
 
-#ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_INSTANCE_H__
-#define WEBKIT_GLUE_PLUGIN_PLUGIN_INSTANCE_H__
+#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_INSTANCE_H_
+#define WEBKIT_PLUGINS_NPAPI_PLUGIN_INSTANCE_H_
 
 #include <map>
 #include <stack>
@@ -26,18 +26,17 @@
 
 class MessageLoop;
 
-namespace webkit_glue {
-class WebPlugin;
-class WebPluginResourceClient;
-}
+namespace webkit {
+namespace npapi {
 
-namespace NPAPI
-{
 class PluginLib;
 class PluginHost;
 class PluginStream;
 class PluginStreamUrl;
 class PluginDataStream;
+class WebPlugin;
+class WebPluginResourceClient;
+
 #if defined(OS_MACOSX)
 class ScopedCurrentPluginEvent;
 #endif
@@ -96,15 +95,15 @@
   void set_transparent(bool value) { transparent_ = value; }
 
   // Get/Set the WebPlugin associated with this instance
-  webkit_glue::WebPlugin* webplugin() { return webplugin_; }
-  void set_web_plugin(webkit_glue::WebPlugin* webplugin) {
+  WebPlugin* webplugin() { return webplugin_; }
+  void set_web_plugin(WebPlugin* webplugin) {
     webplugin_ = webplugin;
   }
 
   // Get the mimeType for this plugin stream
   const std::string &mime_type() { return mime_type_; }
 
-  NPAPI::PluginLib* plugin_lib() { return plugin_; }
+  PluginLib* plugin_lib() { return plugin_; }
 
 #if defined(OS_MACOSX)
   // Get/Set the Mac NPAPI drawing and event models
@@ -148,7 +147,7 @@
 
   // Returns the WebPluginResourceClient object for a stream that has become
   // seekable.
-  webkit_glue::WebPluginResourceClient* GetRangeRequest(int id);
+  WebPluginResourceClient* GetRangeRequest(int id);
 
   // Have the plugin create it's script object.
   NPObject *GetPluginScriptableObject();
@@ -284,7 +283,7 @@
   // 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<NPAPI::PluginLib>          plugin_;
+  scoped_refptr<PluginLib>                 plugin_;
   NPP                                      npp_;
   scoped_refptr<PluginHost>                host_;
   NPPluginFuncs*                           npp_functions_;
@@ -292,7 +291,7 @@
   gfx::PluginWindowHandle                  window_handle_;
   bool                                     windowless_;
   bool                                     transparent_;
-  webkit_glue::WebPlugin*                  webplugin_;
+  WebPlugin*                               webplugin_;
   std::string                              mime_type_;
   GURL                                     get_url_;
   intptr_t                                 get_notify_data_;
@@ -370,6 +369,7 @@
 };
 #endif
 
-} // namespace NPAPI
+}  // namespace npapi
+}  // namespace webkit
 
-#endif  // WEBKIT_GLUE_PLUGIN_PLUGIN_INSTANCE_H__
+#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_INSTANCE_H_