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

webkit/glue/plugins/test/plugin_client.cc

Index: webkit/glue/plugins/test/plugin_client.cc
diff --git a/webkit/plugins/npapi/test/plugin_client.cc b/webkit/glue/plugins/test/plugin_client.cc
similarity index 96%
rename from webkit/plugins/npapi/test/plugin_client.cc
rename to webkit/glue/plugins/test/plugin_client.cc
index 0b28250a39a64068e77a0035a13772b352bb8609..83583409799f60d153581db1e8888cd3fc7e32b7 100644
--- a/webkit/plugins/npapi/test/plugin_client.cc
+++ b/webkit/glue/plugins/test/plugin_client.cc
@@ -1,12 +1,12 @@
-// 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_client.h"
+#include "webkit/glue/plugins/test/plugin_client.h"
 
 #include "base/string_util.h"
-#include "webkit/plugins/npapi/test/plugin_test.h"
-#include "webkit/plugins/npapi/test/plugin_test_factory.h"
+#include "webkit/glue/plugins/test/plugin_test.h"
+#include "webkit/glue/plugins/test/plugin_test_factory.h"
 
 namespace NPAPIClient {