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

webkit/glue/plugins/test/plugin_client.h

Index: webkit/glue/plugins/test/plugin_client.h
diff --git a/webkit/plugins/npapi/test/plugin_client.h b/webkit/glue/plugins/test/plugin_client.h
similarity index 85%
rename from webkit/plugins/npapi/test/plugin_client.h
rename to webkit/glue/plugins/test/plugin_client.h
index c06be2d1d3338a618f3b2912df32df0774cfacf3..a6291b0ab0815b077c096e45541fa5452a649b99 100644
--- a/webkit/plugins/npapi/test/plugin_client.h
+++ b/webkit/glue/plugins/test/plugin_client.h
@@ -1,9 +1,9 @@
-// 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_CLIENT_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CLIENT_H_
+#ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_CLIENT_H__
+#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_CLIENT_H__
 
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/nphostapi.h"
@@ -40,6 +40,6 @@ class PluginClient {
   static NPNetscapeFuncs* host_functions_;
 };
 
-}  // namespace NPAPIClient
+} // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_CLIENT_H_
+#endif  // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_CLIENT_H__