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

webkit/glue/plugins/test/plugin_new_fails_test.h

Index: webkit/glue/plugins/test/plugin_new_fails_test.h
diff --git a/webkit/plugins/npapi/test/plugin_new_fails_test.h b/webkit/glue/plugins/test/plugin_new_fails_test.h
similarity index 52%
rename from webkit/plugins/npapi/test/plugin_new_fails_test.h
rename to webkit/glue/plugins/test/plugin_new_fails_test.h
index 334323ec7582c429d813afed522975149dfd5b9c..1acf9e5c24bf007cdca6a0201e71bbec2d7ab52d 100644
--- a/webkit/plugins/npapi/test/plugin_new_fails_test.h
+++ b/webkit/glue/plugins/test/plugin_new_fails_test.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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_PLUGIN_NEW_FAILS_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PLUGIN_NEW_FAILS_TEST_H_
+#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_PLUGIN_NEW_FAILS_TEST_H__
+#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_PLUGIN_NEW_FAILS_TEST_H__
 
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "webkit/glue/plugins/test/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -16,6 +16,6 @@ class NewFailsTest : public PluginTest {
                       const char* argv[], NPSavedData* saved);
 };
 
-}  // namespace NPAPIClient
+} // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PLUGIN_NPP_NEW_FAILS_TEST_H_
+#endif  // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_PLUGIN_NPP_NEW_FAILS_TEST_H__