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

webkit/glue/plugins/test/plugin_npobject_proxy_test.cc

Index: webkit/glue/plugins/test/plugin_npobject_proxy_test.cc
diff --git a/webkit/plugins/npapi/test/plugin_npobject_proxy_test.cc b/webkit/glue/plugins/test/plugin_npobject_proxy_test.cc
similarity index 91%
rename from webkit/plugins/npapi/test/plugin_npobject_proxy_test.cc
rename to webkit/glue/plugins/test/plugin_npobject_proxy_test.cc
index c9cd27faf9b7cfbc9bc79f72d2653efb5368df47..5b3a2ca6cadb37a14fe1d9f463e5fd20afe234ec 100644
--- a/webkit/plugins/npapi/test/plugin_npobject_proxy_test.cc
+++ b/webkit/glue/plugins/test/plugin_npobject_proxy_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.
 
@@ -9,7 +9,7 @@
 #define STRSAFE_NO_DEPRECATE
 #include <strsafe.h>
 #endif
-#include "webkit/plugins/npapi/test/plugin_npobject_proxy_test.h"
+#include "webkit/glue/plugins/test/plugin_npobject_proxy_test.h"
 
 namespace NPAPIClient {