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

webkit/glue/plugins/test/plugin_windowed_test.h

Index: webkit/glue/plugins/test/plugin_windowed_test.h
diff --git a/webkit/plugins/npapi/test/plugin_windowed_test.h b/webkit/glue/plugins/test/plugin_windowed_test.h
similarity index 67%
rename from webkit/plugins/npapi/test/plugin_windowed_test.h
rename to webkit/glue/plugins/test/plugin_windowed_test.h
index 4906933b71cfa5799cc47b16c095699394a35738..949ea86476bfc3b91ba8b06b3d530da76280a7ee 100644
--- a/webkit/plugins/npapi/test/plugin_windowed_test.h
+++ b/webkit/glue/plugins/test/plugin_windowed_test.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // 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_WINDOWED_TEST_H
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOWED_TEST_H
+#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_WINDOWED_TEST_H
+#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_WINDOWED_TEST_H
 
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "webkit/glue/plugins/test/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -28,6 +28,6 @@ class WindowedPluginTest : public PluginTest {
   bool done_;
 };
 
-}  // namespace NPAPIClient
+} // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_WINDOWED_TEST_H
+#endif  // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_WINDOWED_TEST_H