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

webkit/glue/plugins/webplugin_delegate.cc

Index: webkit/glue/plugins/webplugin_delegate.cc
diff --git a/webkit/plugins/npapi/webplugin_delegate.cc b/webkit/glue/plugins/webplugin_delegate.cc
similarity index 85%
rename from webkit/plugins/npapi/webplugin_delegate.cc
rename to webkit/glue/plugins/webplugin_delegate.cc
index f8ea1cb2df71ae2615511ee89bfb14a0f8e7ff5b..c3fb53b765d298d64d11f39ee8332659c54a0feb 100644
--- a/webkit/plugins/npapi/webplugin_delegate.cc
+++ b/webkit/glue/plugins/webplugin_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_delegate.h"
+#include "webkit/glue/plugins/webplugin_delegate.h"
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
 
 bool WebPluginDelegate::StartFind(const string16& search_text,
                                   bool case_sensitive,
@@ -37,5 +36,5 @@ string16 WebPluginDelegate::GetSelectionAsMarkup() const {
   return string16();
 }
 
-}  // namespace npapi
-}  // namespace webkit
+
+}  // namespace webkit_glue