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

webkit/glue/plugins/test/plugin_setup_test.cc

Index: webkit/glue/plugins/test/plugin_setup_test.cc
diff --git a/webkit/plugins/npapi/test/plugin_setup_test.cc b/webkit/glue/plugins/test/plugin_setup_test.cc
similarity index 85%
rename from webkit/plugins/npapi/test/plugin_setup_test.cc
rename to webkit/glue/plugins/test/plugin_setup_test.cc
index ded1379508c256ee767732a55560c636478da9a6..e4c4903150ff7e30e193a696f22eb9a0fcc7e907 100644
--- a/webkit/plugins/npapi/test/plugin_setup_test.cc
+++ b/webkit/glue/plugins/test/plugin_setup_test.cc
@@ -5,7 +5,7 @@
 #include "base/basictypes.h"
 #include "base/string_util.h"
 
-#include "webkit/plugins/npapi/test/plugin_setup_test.h"
+#include "webkit/glue/plugins/test/plugin_setup_test.h"
 
 namespace NPAPIClient {
 
@@ -19,4 +19,4 @@ NPError PluginSetupTest::SetWindow(NPWindow* pNPWindow) {
   return NPERR_NO_ERROR;
 }
 
-}  // namespace NPAPIClient
+} // namespace NPAPIClient