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

webkit/glue/plugins/test/plugin_test.cc

Index: webkit/glue/plugins/test/plugin_test.cc
diff --git a/webkit/plugins/npapi/test/plugin_test.cc b/webkit/glue/plugins/test/plugin_test.cc
similarity index 96%
rename from webkit/plugins/npapi/test/plugin_test.cc
rename to webkit/glue/plugins/test/plugin_test.cc
index c9480104b2a0a2722f5f80cee37f1665e4174ede..6717e4b16e15032d6bd270242fad19f3af7f601d 100644
--- a/webkit/plugins/npapi/test/plugin_test.cc
+++ b/webkit/glue/plugins/test/plugin_test.cc
@@ -1,11 +1,11 @@
-// 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.
 
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "webkit/glue/plugins/test/plugin_test.h"
 
 #include "base/string_util.h"
-#include "webkit/plugins/npapi/test/npapi_constants.h"
+#include "webkit/glue/plugins/test/npapi_constants.h"
 
 namespace NPAPIClient {