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

webkit/glue/plugins/test/plugin_javascript_open_popup.cc

Index: webkit/glue/plugins/test/plugin_javascript_open_popup.cc
diff --git a/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc b/webkit/glue/plugins/test/plugin_javascript_open_popup.cc
similarity index 94%
rename from webkit/plugins/npapi/test/plugin_javascript_open_popup.cc
rename to webkit/glue/plugins/test/plugin_javascript_open_popup.cc
index 583a55e534ba7e4b5041a8b768eb9d29993f015b..0f93bf46c1ea8e305d66fcaa7feaf526c0bbb4b4 100644
--- a/webkit/plugins/npapi/test/plugin_javascript_open_popup.cc
+++ b/webkit/glue/plugins/test/plugin_javascript_open_popup.cc
@@ -1,14 +1,14 @@
-// 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 "build/build_config.h"
-#include "webkit/plugins/npapi/test/plugin_javascript_open_popup.h"
+#include "webkit/glue/plugins/test/plugin_javascript_open_popup.h"
 
 #if defined(USE_X11)
 #include "third_party/npapi/bindings/npapi_x11.h"
 #endif
-#include "webkit/plugins/npapi/test/plugin_client.h"
+#include "webkit/glue/plugins/test/plugin_client.h"
 
 namespace NPAPIClient {