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

webkit/glue/plugins/plugin_stream.h

Index: webkit/glue/plugins/plugin_stream.h
diff --git a/webkit/plugins/npapi/plugin_stream.h b/webkit/glue/plugins/plugin_stream.h
similarity index 94%
rename from webkit/plugins/npapi/plugin_stream.h
rename to webkit/glue/plugins/plugin_stream.h
index 040e4fe77de4e70ca3d1504e6f8c550c41bda67a..c5975b4d6c69b37bd98fcd1831cec61f41b1a394 100644
--- a/webkit/plugins/npapi/plugin_stream.h
+++ b/webkit/glue/plugins/plugin_stream.h
@@ -2,22 +2,27 @@
 // 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_STREAM_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGIN_STREAM_H_
+#ifndef WEBKIT_GLUE_PLUGINS_PLUGIN_STREAM_H_
+#define WEBKIT_GLUE_PLUGINS_PLUGIN_STREAM_H_
+
+#include "build/build_config.h"
 
 #include <string>
 #include <vector>
 
+#if defined(OS_POSIX)
 #include "base/file_path.h"
+#endif
 #include "base/ref_counted.h"
-#include "build/build_config.h"
 #include "third_party/npapi/bindings/npapi.h"
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
+class WebPluginResourceClient;
+}
+
+namespace NPAPI {
 
 class PluginInstance;
-class WebPluginResourceClient;
 
 // Base class for a NPAPI stream.  Tracks basic elements
 // of a stream for NPAPI notifications and stream position.
@@ -59,7 +64,7 @@ class PluginStream : public base::RefCounted<PluginStream> {
   // Close the stream.
   virtual bool Close(NPReason reason);
 
-  virtual WebPluginResourceClient* AsResourceClient();
+  virtual webkit_glue::WebPluginResourceClient* AsResourceClient();
 
   // Cancels any HTTP requests initiated by the stream.
   virtual void CancelRequest() {}
@@ -146,7 +151,6 @@ class PluginStream : public base::RefCounted<PluginStream> {
   DISALLOW_COPY_AND_ASSIGN(PluginStream);
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI
 
-#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_STREAM_H_
+#endif  // WEBKIT_GLUE_PLUGINS_PLUGIN_STREAM_H_