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

webkit/glue/webkit_glue.h

Index: webkit/glue/webkit_glue.h
diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index 38ea65940012a7982ecfd7efcb98882cfe2bee39..fbb541a9614feaf9481a3015ecfcefbf7a06dfb8 100644
--- a/webkit/glue/webkit_glue.h
+++ b/webkit/glue/webkit_glue.h
@@ -23,6 +23,7 @@
 
 class GURL;
 class SkBitmap;
+struct WebPluginInfo;
 
 namespace base {
 class StringPiece;
@@ -38,12 +39,6 @@ class WebString;
 class WebView;
 }
 
-namespace webkit {
-namespace npapi {
-struct WebPluginInfo;
-}
-}
-
 namespace webkit_glue {
 
 
@@ -230,8 +225,7 @@ bool GetApplicationDirectory(FilePath* path);
 bool GetExeDirectory(FilePath* path);
 
 // Embedders implement this function to return the list of plugins to Webkit.
-void GetPlugins(bool refresh,
-                std::vector<webkit::npapi::WebPluginInfo>* plugins);
+void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins);
 
 // Returns true if the plugins run in the same process as the renderer, and
 // false otherwise.