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

webkit/plugins/npapi/test/plugin_arguments_test.cc

 // 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.
 
+#include "webkit/plugins/npapi/test/plugin_arguments_test.h"
+
 #include "base/basictypes.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 
-#include "webkit/glue/plugins/test/plugin_arguments_test.h"
-
 namespace NPAPIClient {
 
 PluginArgumentsTest::PluginArgumentsTest(NPP id,
                                          NPNetscapeFuncs *host_functions)
   : PluginTest(id, host_functions) {
 }
 
 NPError PluginArgumentsTest::New(uint16 mode, int16 argc,
                                  const char* argn[], const char* argv[],
                                  NPSavedData* saved) {
@@ skipping 38 matching lines @@
   return PluginTest::New(mode, argc, argn, argv, saved);
 }
 
 NPError PluginArgumentsTest::SetWindow(NPWindow* pNPWindow) {
   // This test just tests the arguments.  We're done now.
   this->SignalTestCompleted();
 
   return NPERR_NO_ERROR;
 }
 
-} // namespace NPAPIClient
+}  // namespace NPAPIClient