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

webkit/glue/plugins/test/plugin_private_test.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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_private_test.h"
+#include "webkit/glue/plugins/test/plugin_private_test.h"
 
 #include "base/basictypes.h"
 #include "base/string_util.h"
-#include "webkit/plugins/npapi/test/plugin_client.h"
+#include "webkit/glue/plugins/test/plugin_client.h"
 
 namespace NPAPIClient {
 
 PrivateTest::PrivateTest(NPP id, NPNetscapeFuncs *host_functions)
     : PluginTest(id, host_functions) {
 }
 
 NPError PrivateTest::New(uint16 mode, int16 argc,
                          const char* argn[], const char* argv[],
                          NPSavedData* saved) {
@@ skipping 28 matching lines @@
     HostFunctions()->releasevariantvalue(&location_var);
     HostFunctions()->releaseobject(window_obj);
   }
 
   SignalTestCompleted();
 
   return NPERR_NO_ERROR;
 }
 
 } // namespace NPAPIClient