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

chrome/common/render_messages_params.h

Index: chrome/common/render_messages_params.h
diff --git a/chrome/common/render_messages_params.h b/chrome/common/render_messages_params.h
index 911e3aefe085818a184944d66451853b78ade8a2..7b21a2035d5272cf5ea22564dbec5261718dfc12 100644
--- a/chrome/common/render_messages_params.h
+++ b/chrome/common/render_messages_params.h
@@ -32,11 +32,11 @@
 #include "media/audio/audio_parameters.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebTextDirection.h"
 #include "webkit/glue/password_form.h"
+#include "webkit/glue/plugins/webplugin.h"
 #include "webkit/glue/resource_type.h"
 #include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webmenuitem.h"
 #include "webkit/glue/webpreferences.h"
-#include "webkit/plugins/npapi/webplugin.h"
 
 // TODO(erg): Split this file into $1_db_params.h, $1_audio_params.h,
 // $1_print_params.h and $1_render_params.h.
@@ -356,7 +356,7 @@ struct ViewHostMsg_UpdateRect_Params {
   gfx::Rect resizer_rect;
 
   // New window locations for plugin child windows.
-  std::vector<webkit::npapi::WebPluginGeometry> plugin_window_moves;
+  std::vector<webkit_glue::WebPluginGeometry> plugin_window_moves;
 
   // The following describes the various bits that may be set in flags:
   //