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

webkit/glue/plugins/test/plugin_create_instance_in_paint.h

Index: webkit/glue/plugins/test/plugin_create_instance_in_paint.h
diff --git a/webkit/plugins/npapi/test/plugin_create_instance_in_paint.h b/webkit/glue/plugins/test/plugin_create_instance_in_paint.h
similarity index 70%
rename from webkit/plugins/npapi/test/plugin_create_instance_in_paint.h
rename to webkit/glue/plugins/test/plugin_create_instance_in_paint.h
index 59f196f03483e7cc0281ee624db47da3ca7e6b77..84d7a945d738c0fc305e3af5dfbf2c111c7ca670 100644
--- a/webkit/plugins/npapi/test/plugin_create_instance_in_paint.h
+++ b/webkit/glue/plugins/test/plugin_create_instance_in_paint.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_CREATE_INSTANCE_IN_PAINT_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_
+#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H
+#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H
 
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "webkit/glue/plugins/test/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -28,6 +28,6 @@ class CreateInstanceInPaintTest : public PluginTest {
   bool created_;
 };
 
-}  // namespace NPAPIClient
+} // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H_
+#endif  // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_CREATE_INSTANCE_IN_PAINT_H