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

chrome/renderer/render_widget.h

Index: chrome/renderer/render_widget.h
diff --git a/chrome/renderer/render_widget.h b/chrome/renderer/render_widget.h
index 0fd66348f55a5ff62d5d0afa619cc84ac24a2507..92826e9d069bd9939dcc3aa62598623143b2b12e 100644
--- a/chrome/renderer/render_widget.h
+++ b/chrome/renderer/render_widget.h
@@ -46,9 +46,11 @@ class WebWidget;
 struct WebPopupMenuInfo;
 }
 
-namespace webkit_glue {
+namespace webkit {
+namespace npapi {
 struct WebPluginGeometry;
 }
+}
 
 // RenderWidget provides a communication bridge between a WebWidget and
 // a RenderWidgetHost, the latter of which lives in a different process.
@@ -111,7 +113,7 @@ class RenderWidget : public IPC::Channel::Listener,
 
   // Called when a plugin is moved.  These events are queued up and sent with
   // the next paint or scroll message to the host.
-  void SchedulePluginMove(const webkit_glue::WebPluginGeometry& move);
+  void SchedulePluginMove(const webkit::npapi::WebPluginGeometry& move);
 
   // Called when a plugin window has been destroyed, to make sure the currently
   // pending moves don't try to reference it.
@@ -337,7 +339,7 @@ class RenderWidget : public IPC::Channel::Listener,
   WebKit::WebPopupType popup_type_;
 
   // Holds all the needed plugin window moves for a scroll.
-  typedef std::vector<webkit_glue::WebPluginGeometry> WebPluginGeometryVector;
+  typedef std::vector<webkit::npapi::WebPluginGeometry> WebPluginGeometryVector;
   WebPluginGeometryVector plugin_window_moves_;
 
   // A custom background for the widget.