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

webkit/plugins/npapi/test/plugin_arguments_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_ARGUMENTS_TEST_H__
-#define WEBKIT_PORT_PLUGINS_TEST_PLUGIN_ARGUMENTS_TEST_H__
+#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_ARGUMENTS_TEST_H_
+#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_ARGUMENTS_TEST_H_
 
-#include "webkit/glue/plugins/test/plugin_test.h"
+#include "webkit/plugins/npapi/test/plugin_test.h"
 
 namespace NPAPIClient {
 
 // The PluginArgumentsTest test that we properly receive arguments
 // intended for the plugin.
 //
 // This is basically overkill for testing that the arguments passed
 // to the plugin match what we expect.
 //
 // We expect to find the following arguments:
@@ skipping 12 matching lines @@
   PluginArgumentsTest(NPP id, NPNetscapeFuncs *host_functions);
 
   // Initialize this PluginTest based on the arguments from NPP_New.
   virtual NPError  New(uint16 mode, int16 argc, const char* argn[],
                        const char* argv[], NPSavedData* saved);
 
   // NPAPI SetWindow handler.
   virtual NPError SetWindow(NPWindow* pNPWindow);
 };
 
-} // namespace NPAPIClient
+}  // namespace NPAPIClient
 
-#endif  // WEBKIT_PORT_PLUGINS_TEST_PLUGIN_ARGUMENTS_TEST_H__
+#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_ARGUMENTS_TEST_H_