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

webkit/glue/plugins/test/plugin_test.h

Index: webkit/glue/plugins/test/plugin_test.h
diff --git a/webkit/plugins/npapi/test/plugin_test.h b/webkit/glue/plugins/test/plugin_test.h
similarity index 96%
rename from webkit/plugins/npapi/test/plugin_test.h
rename to webkit/glue/plugins/test/plugin_test.h
index fee09d34545466d601724374b8e41f09565eac20..f3f89378c19b339e0f81038ad875fe009a7ba629 100644
--- a/webkit/plugins/npapi/test/plugin_test.h
+++ b/webkit/glue/plugins/test/plugin_test.h
@@ -2,8 +2,8 @@
 // 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_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_H_
+#ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_TEST_H_
+#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_TEST_H_
 
 #include <string>
 
@@ -129,6 +129,6 @@ class PluginTest {
   bool                      test_completed_;
 };
 
-}  // namespace NPAPIClient
+} // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_TEST_H_
+#endif  // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_TEST_H_