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

webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h

Index: webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h
diff --git a/webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h b/webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h
similarity index 60%
rename from webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h
rename to webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.h
index dca9de355273b67362fe6612bfc57a8f0ac5feda..418e97684216b9282067de90321eee8bbbcf5c01 100644
--- a/webkit/plugins/npapi/test/plugin_delete_plugin_in_stream_test.h
+++ b/webkit/glue/plugins/test/plugin_delete_plugin_in_stream_test.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_DELETE_PLUGIN_IN_STREAM_TEST_H_
-#define WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H_
+#ifndef WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H
+#define WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H
 
-#include "webkit/plugins/npapi/test/plugin_test.h"
+#include "webkit/glue/plugins/test/plugin_test.h"
 
 namespace NPAPIClient {
 
@@ -25,6 +25,6 @@ class DeletePluginInStreamTest : public PluginTest {
   std::string self_url_;
 };
 
-}  // namespace NPAPIClient
+} // namespace NPAPIClient
 
-#endif  // WEBKIT_PLUGINS_NPAPI_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H_
+#endif  // WEBKIT_GLUE_PLUGINS_TEST_PLUGIN_DELETE_PLUGIN_IN_STREAM_TEST_H