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

webkit/glue/plugins/plugin_string_stream.h

Index: webkit/glue/plugins/plugin_string_stream.h
diff --git a/webkit/plugins/npapi/plugin_string_stream.h b/webkit/glue/plugins/plugin_string_stream.h
similarity index 74%
rename from webkit/plugins/npapi/plugin_string_stream.h
rename to webkit/glue/plugins/plugin_string_stream.h
index 1fdeea293b0da8e2ed171e98d11797f7b5ab5a23..68db2bfec4e75976ea634007537a3f523405a744 100644
--- a/webkit/plugins/npapi/plugin_string_stream.h
+++ b/webkit/glue/plugins/plugin_string_stream.h
@@ -2,15 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_STRING_STREAM_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGIN_STRING_STREAM_H_
+#ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_STRING_STREAM_H_
+#define WEBKIT_GLUE_PLUGIN_PLUGIN_STRING_STREAM_H_
 
-#include "webkit/plugins/npapi/plugin_stream.h"
+#include "webkit/glue/plugins/plugin_stream.h"
 
 class GURL;
 
-namespace webkit {
-namespace npapi {
+namespace NPAPI {
 
 class PluginInstance;
 
@@ -35,8 +34,6 @@ class PluginStringStream : public PluginStream {
   DISALLOW_COPY_AND_ASSIGN(PluginStringStream);
 };
 
+} // namespace NPAPI
 
-}  // namespace npapi
-}  // namespace webkit
-
-#endif // WEBKIT_PLUGINS_NPAPI_PLUGIN_STRING_STREAM_H_
+#endif // WEBKIT_GLUE_PLUGIN_PLUGIN_STRING_STREAM_H_