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

webkit/glue/plugins/test/plugin_javascript_open_popup.h

Index: webkit/glue/plugins/test/plugin_javascript_open_popup.h
diff --git a/webkit/plugins/npapi/test/plugin_javascript_open_popup.h b/webkit/glue/plugins/test/plugin_javascript_open_popup.h
similarity index 78%
rename from webkit/plugins/npapi/test/plugin_javascript_open_popup.h
rename to webkit/glue/plugins/test/plugin_javascript_open_popup.h
index 6381d256ddb8eee1b0a399a77603dcc840e38822..552397ad02efbb1f6a53a7b9f94adc3e7fa384cb 100644
--- a/webkit/plugins/npapi/test/plugin_javascript_open_popup.h
+++ b/webkit/glue/plugins/test/plugin_javascript_open_popup.h
@@ -1,11 +1,11 @@
-// 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.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_
+#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H
+#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H
 
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "webkit/glue/plugins/test/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -42,6 +42,6 @@ class ExecuteJavascriptPopupWindowTargetPluginTest : public PluginTest {
   bool test_completed_;
 };
 
-}  // namespace NPAPIClient
+} // namespace NPAPIClient
 
-#endif // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H_
+#endif // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_JAVASCRIPT_OPEN_POPUP_H