Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugin...

chrome/common/render_messages.h

Index: chrome/common/render_messages.h
===================================================================
--- chrome/common/render_messages.h	(revision 69765)
+++ chrome/common/render_messages.h	(working copy)
@@ -61,17 +61,10 @@
 struct ResourceResponseInfo;
 struct WebAccessibility;
 struct WebCookie;
+struct WebPluginGeometry;
 struct WebAccessibility;
 }
 
-namespace webkit {
-namespace npapi {
-struct WebPluginGeometry;
-struct WebPluginInfo;
-struct WebPluginMimeType;
-}
-}
-
 struct AudioBuffersState;
 class ExtensionExtent;
 class GURL;
@@ -84,6 +77,8 @@
 struct RendererPreferences;
 struct WebDropData;
 struct WebMenuItem;
+struct WebPluginInfo;
+struct WebPluginMimeType;
 struct WebPreferences;
 
 // Forward declarations of structures used to store data for when we have a lot
@@ -156,8 +151,8 @@
 };
 
 template <>
-struct ParamTraits<webkit::npapi::WebPluginGeometry> {
-  typedef webkit::npapi::WebPluginGeometry param_type;
+struct ParamTraits<webkit_glue::WebPluginGeometry> {
+  typedef webkit_glue::WebPluginGeometry param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, void** iter, param_type* p);
   static void Log(const param_type& p, std::string* l);
@@ -165,16 +160,16 @@
 
 // Traits for ViewMsg_GetPlugins_Reply structure to pack/unpack.
 template <>
-struct ParamTraits<webkit::npapi::WebPluginMimeType> {
-  typedef webkit::npapi::WebPluginMimeType param_type;
+struct ParamTraits<WebPluginMimeType> {
+  typedef WebPluginMimeType param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, void** iter, param_type* r);
   static void Log(const param_type& p, std::string* l);
 };
 
 template <>
-struct ParamTraits<webkit::npapi::WebPluginInfo> {
-  typedef webkit::npapi::WebPluginInfo param_type;
+struct ParamTraits<WebPluginInfo> {
+  typedef WebPluginInfo param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, void** iter, param_type* r);
   static void Log(const param_type& p, std::string* l);