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

webkit/glue/plugins/plugin_stream.h

 // Copyright (c) 2010 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_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.
 class PluginStream : public base::RefCounted<PluginStream> {
  public:
   // Create a new PluginStream object.  If needNotify is true, then the
   // plugin will be notified when the stream has been fully sent.
   PluginStream(PluginInstance *instance,
                const char *url,
                bool need_notify,
@@ skipping 21 matching lines @@
 
   // Write the result as a file.
   void WriteAsFile();
 
   // Notify the plugin that a stream is complete.
   void Notify(NPReason reason);
 
   // 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() {}
 
   const NPStream* stream() const { return &stream_; }
 
   // setter/getter for the seekable attribute on the stream.
   bool seekable() const { return seekable_stream_; }
 
   void set_seekable(bool seekable) { seekable_stream_ = seekable; }
@@ skipping 66 matching lines @@
   FILE*                         temp_file_;
   FilePath                      temp_file_path_;
 #endif
   std::vector<char>             delivery_data_;
   int                           data_offset_;
   bool                          seekable_stream_;
   std::string                   mime_type_;
   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_