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

webkit/glue/plugins/test/npapi_constants.h

-// 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.
 
 // Constants for the NPAPI test
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_NPAPI_CONSTANTS_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_NPAPI_CONSTANTS_H_
+#ifndef WEBKIT_PORT_PLUGINS_TEST_NPAPI_CONSTANTS_H__
+#define WEBKIT_PORT_PLUGINS_TEST_NPAPI_CONSTANTS_H__
 
 namespace NPAPIClient {
-
 // The name of the cookie which will be used to communicate between
 // the plugin and the test harness.
 extern const char kTestCompleteCookie[];
 
 // The cookie value which will be sent to the client upon successful
 // test.
 extern const char kTestCompleteSuccess[];
-
-}  // namespace NPAPIClient
-
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_NPAPI_CONSTANTS_H_
+}
+#endif  // WEBKIT_PORT_PLUGINS_TEST_NPAPI_CONSTANTS_H__