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

webkit/glue/plugins/test/plugin_geturl_test.h

Index: webkit/glue/plugins/test/plugin_geturl_test.h
diff --git a/webkit/plugins/npapi/test/plugin_geturl_test.h b/webkit/glue/plugins/test/plugin_geturl_test.h
similarity index 85%
rename from webkit/plugins/npapi/test/plugin_geturl_test.h
rename to webkit/glue/plugins/test/plugin_geturl_test.h
index 79c623ba74a6fbf1998ac02f15de5dc988145515..df8d7414368fae8b515b0c62f6b6cff3b05bc90b 100644
--- a/webkit/plugins/npapi/test/plugin_geturl_test.h
+++ b/webkit/glue/plugins/test/plugin_geturl_test.h
@@ -1,13 +1,13 @@
-// 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_GETURL_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_GETURL_TEST_H_
+#ifndef WEBKIT_PORT_PLUGINS_TEST_PLUGIN_GETURL_TEST_H__
+#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_GETURL_TEST_H__
 
 #include <stdio.h>
 
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "webkit/glue/plugins/test/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -56,6 +56,6 @@ class PluginGetURLTest : public PluginTest {
   std::string referrer_target_url_;
 };
 
-}  // namespace NPAPIClient
+} // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_GETURL_TEST_H_
+#endif  // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_GETURL_TEST_H__