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

chrome/browser/renderer_host/render_message_filter.h

Index: chrome/browser/renderer_host/render_message_filter.h
diff --git a/chrome/browser/renderer_host/render_message_filter.h b/chrome/browser/renderer_host/render_message_filter.h
index 5c988b83e887c0d133ff58fdf10c102ea5118313..9a8a745c543fe1a11e7977d69d4ddecff7305d88 100644
--- a/chrome/browser/renderer_host/render_message_filter.h
+++ b/chrome/browser/renderer_host/render_message_filter.h
@@ -41,12 +41,7 @@ class RenderWidgetHelper;
 class URLRequestContextGetter;
 struct ViewHostMsg_CreateWindow_Params;
 struct ViewHostMsg_CreateWorker_Params;
-
-namespace webkit {
-namespace npapi {
 struct WebPluginInfo;
-}
-}
 
 namespace base {
 class SharedMemory;
@@ -158,7 +153,7 @@ class RenderMessageFilter : public BrowserMessageFilter,
                                    const std::string& mime_type,
                                    IPC::Message* reply_msg);
   void OnGotPluginInfo(bool found,
-                       const webkit::npapi::WebPluginInfo& info,
+                       const WebPluginInfo& info,
                        const std::string& actual_mime_type,
                        const GURL& policy_url,
                        IPC::Message* reply_msg);