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

webkit/glue/plugins/test/plugin_npobject_lifetime_test.cc

Index: webkit/glue/plugins/test/plugin_npobject_lifetime_test.cc
diff --git a/webkit/plugins/npapi/test/plugin_npobject_lifetime_test.cc b/webkit/glue/plugins/test/plugin_npobject_lifetime_test.cc
similarity index 97%
rename from webkit/plugins/npapi/test/plugin_npobject_lifetime_test.cc
rename to webkit/glue/plugins/test/plugin_npobject_lifetime_test.cc
index f49323823027c40726473d1d4f73202008ad043b..456450637326d4be0af2899e0420fc15d2eb2168 100644
--- a/webkit/plugins/npapi/test/plugin_npobject_lifetime_test.cc
+++ b/webkit/glue/plugins/test/plugin_npobject_lifetime_test.cc
@@ -1,8 +1,8 @@
-// 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_npobject_lifetime_test.h"
+#include "webkit/glue/plugins/test/plugin_npobject_lifetime_test.h"
 
 namespace NPAPIClient {