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

them in the webkit::npapi namespace.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6012002

TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/5961004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69766 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 8 deletions

diff --git a/webkit/glue/webkit_glue.h b/webkit/glue/webkit_glue.h
index 38ea659..fbb541a 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.