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

webkit/glue/plugins/test/plugin_setup_test.h

Index: webkit/glue/plugins/test/plugin_setup_test.h
diff --git a/webkit/plugins/npapi/test/plugin_setup_test.h b/webkit/glue/plugins/test/plugin_setup_test.h
similarity index 65%
rename from webkit/plugins/npapi/test/plugin_setup_test.h
rename to webkit/glue/plugins/test/plugin_setup_test.h
index 709b3b15caea464d11e63ee72843d0265e6c51a8..b01bc421de09bb50d4262e6e011100672a26d444 100644
--- a/webkit/plugins/npapi/test/plugin_setup_test.h
+++ b/webkit/glue/plugins/test/plugin_setup_test.h
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SETUP_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SETUP_TEST_H_
+#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_SETUP_TEST_H__
+#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_SETUP_TEST_H__
 
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "webkit/glue/plugins/test/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -19,6 +19,6 @@ class PluginSetupTest : public PluginTest {
   virtual NPError SetWindow(NPWindow* pNPWindow);
 };
 
-}  // namespace NPAPIClient
+} // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_SETUP_TEST_H_
+#endif  // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_SETUP_TEST_H__