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

webkit/glue/plugins/test/npapi_test.cc

Index: webkit/glue/plugins/test/npapi_test.cc
diff --git a/webkit/plugins/npapi/test/npapi_test.cc b/webkit/glue/plugins/test/npapi_test.cc
similarity index 96%
rename from webkit/plugins/npapi/test/npapi_test.cc
rename to webkit/glue/plugins/test/npapi_test.cc
index 26dc45df10d7e86dcd0483e3e64c64ef5c36916f..895a8424d32c6e5c924de54ae84d1af7ba97ad15 100644
--- a/webkit/plugins/npapi/test/npapi_test.cc
+++ b/webkit/glue/plugins/test/npapi_test.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -53,7 +53,7 @@
 #define EXPORT
 #endif
 
-#include "webkit/plugins/npapi/test/plugin_client.h"
+#include "webkit/glue/plugins/test/plugin_client.h"
 
 #if defined(OS_WIN)
 BOOL API_CALL DllMain(HINSTANCE hDll, DWORD dwReason, LPVOID lpReserved) {