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

webkit/glue/plugins/test/plugin_private_test.h

Index: webkit/glue/plugins/test/plugin_private_test.h
diff --git a/webkit/plugins/npapi/test/plugin_private_test.h b/webkit/glue/plugins/test/plugin_private_test.h
similarity index 63%
rename from webkit/plugins/npapi/test/plugin_private_test.h
rename to webkit/glue/plugins/test/plugin_private_test.h
index 9079a118d6d5bd8a47274052aa1f755997eab76c..db6b5d18cafa6ea8d3e7a4f548e1fce6f40c35d6 100644
--- a/webkit/plugins/npapi/test/plugin_private_test.h
+++ b/webkit/glue/plugins/test/plugin_private_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_PRIVATE_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PRIVATE_TEST_H_
+#ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_PRIVATE_TEST_H_
+#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_PRIVATE_TEST_H_
 
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "webkit/glue/plugins/test/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -20,6 +20,6 @@ class PrivateTest : public PluginTest {
                       const char* argv[], NPSavedData* saved);
 };
 
-}  // namespace NPAPIClient
+} // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_PRIVATE_TEST_H_
+#endif  // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_PRIVATE_TEST_H_