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

chrome/renderer/blocked_plugin.h

Index: chrome/renderer/blocked_plugin.h
diff --git a/chrome/renderer/blocked_plugin.h b/chrome/renderer/blocked_plugin.h
index 7b616bf586a2f6799c4edcd19edf3d0708b4143b..53859bc71a612e8a265c7cf9c8a05c61905a3c4f 100644
--- a/chrome/renderer/blocked_plugin.h
+++ b/chrome/renderer/blocked_plugin.h
@@ -11,32 +11,26 @@
 #include "chrome/renderer/custom_menu_listener.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebPluginParams.h"
 #include "webkit/glue/cpp_bound_class.h"
-#include "webkit/plugins/npapi/webview_plugin.h"
+#include "webkit/glue/plugins/webview_plugin.h"
 
 class GURL;
-class RenderView;
-
-
-namespace webkit {
-namespace npapi {
 class PluginGroup;
-}
-}
+class RenderView;
 
 class BlockedPlugin : public CppBoundClass,
-                      public webkit::npapi::WebViewPlugin::Delegate,
+                      public WebViewPlugin::Delegate,
                       public NotificationObserver,
                       public CustomMenuListener {
  public:
   BlockedPlugin(RenderView* render_view,
                 WebKit::WebFrame* frame,
-                const webkit::npapi::PluginGroup& info,
+                const PluginGroup& info,
                 const WebKit::WebPluginParams& params,
                 const WebPreferences& settings,
                 int template_id,
                 const string16& message);
 
-  webkit::npapi::WebViewPlugin* plugin() { return plugin_; }
+  WebViewPlugin* plugin() { return plugin_; }
 
   // WebViewPlugin::Delegate methods:
   virtual void BindWebFrame(WebKit::WebFrame* frame);
@@ -68,7 +62,7 @@ class BlockedPlugin : public CppBoundClass,
   RenderView* render_view_;
   WebKit::WebFrame* frame_;
   WebKit::WebPluginParams plugin_params_;
-  webkit::npapi::WebViewPlugin* plugin_;
+  WebViewPlugin* plugin_;
   // The name of the plugin that was blocked.
   string16 name_;