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

webkit/glue/plugins/webplugin_file_delegate.cc

Index: webkit/glue/plugins/webplugin_file_delegate.cc
diff --git a/webkit/plugins/npapi/webplugin_file_delegate.cc b/webkit/glue/plugins/webplugin_file_delegate.cc
similarity index 75%
rename from webkit/plugins/npapi/webplugin_file_delegate.cc
rename to webkit/glue/plugins/webplugin_file_delegate.cc
index e110a6b124e428d835c0ef6c6c32fcfb3cdcd28d..68c4c6008c265c8f51a9595a88ee2bf1f80dc8f9 100644
--- a/webkit/plugins/npapi/webplugin_file_delegate.cc
+++ b/webkit/glue/plugins/webplugin_file_delegate.cc
@@ -2,10 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/plugins/npapi/webplugin_file_delegate.h"
+#include "webkit/glue/plugins/webplugin_file_delegate.h"
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
 
 bool WebPluginFileDelegate::ChooseFile(const char* mime_types,
                                        int mode,
@@ -14,6 +13,5 @@ bool WebPluginFileDelegate::ChooseFile(const char* mime_types,
   return false;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue