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

webkit/glue/plugins/test/npapi_constants.cc

Index: webkit/glue/plugins/test/npapi_constants.cc
diff --git a/webkit/plugins/npapi/test/npapi_constants.cc b/webkit/glue/plugins/test/npapi_constants.cc
similarity index 59%
rename from webkit/plugins/npapi/test/npapi_constants.cc
rename to webkit/glue/plugins/test/npapi_constants.cc
index 94d3284b0eebe7426542c3a4ca9212dcd7a976e6..75cc68f396d92d976aaad0f439a9f2d2eb4e9880 100644
--- a/webkit/plugins/npapi/test/npapi_constants.cc
+++ b/webkit/glue/plugins/test/npapi_constants.cc
@@ -1,12 +1,10 @@
-// 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/npapi_constants.h"
+#include "webkit/glue/plugins/test/npapi_constants.h"
 
 namespace NPAPIClient {
-
 const char kTestCompleteCookie[]  = "status";
 const char kTestCompleteSuccess[] = "OK";
-
-}  // namespace NPAPIClient
+}