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

webkit/plugins/npapi/test/plugin_geturl_test.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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_PORT_PLUGINS_TEST_PLUGIN_GETURL_TEST_H__
-#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_GETURL_TEST_H__
+#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_GETURL_TEST_H_
+#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_GETURL_TEST_H_
 
 #include <stdio.h>
 
-#include "webkit/glue/plugins/test/plugin_test.h"
+#include "webkit/plugins/npapi/test/plugin_test.h"
 
 namespace NPAPIClient {
 
 // The PluginGetURLTest test functionality of the NPN_GetURL
 // and NPN_GetURLNotify methods.
 //
 // This test first discovers it's URL by sending a GetURL request
 // for 'javascript:top.location'.  After receiving that, the
 // test will request the url itself (again via GetURL).
 class PluginGetURLTest : public PluginTest {
@@ skipping 28 matching lines @@
   bool npn_evaluate_context_;
   // The following two flags handle URL redirect notifications received by
   // plugins.
   bool handle_url_redirects_;
   bool received_url_redirect_notification_;
   std::string page_not_found_url_;
   std::string fail_write_url_;
   std::string referrer_target_url_;
 };
 
-} // namespace NPAPIClient
+}  // namespace NPAPIClient
 
-#endif  // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_GETURL_TEST_H__
+#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_GETURL_TEST_H_