Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put...

webkit/plugins/npapi/plugin_stream.h

Index: webkit/plugins/npapi/plugin_stream.h
===================================================================
--- webkit/plugins/npapi/plugin_stream.h	(revision 0)
+++ webkit/plugins/npapi/plugin_stream.h	(working copy)
@@ -2,27 +2,22 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_GLUE_PLUGINS_PLUGIN_STREAM_H_
-#define WEBKIT_GLUE_PLUGINS_PLUGIN_STREAM_H_
+#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_STREAM_H_
+#define WEBKIT_PLUGINS_NPAPI_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_glue {
-class WebPluginResourceClient;
-}
+namespace webkit {
+namespace npapi {
 
-namespace NPAPI {
-
 class PluginInstance;
+class WebPluginResourceClient;
 
 // Base class for a NPAPI stream.  Tracks basic elements
 // of a stream for NPAPI notifications and stream position.
@@ -64,7 +59,7 @@
   // Close the stream.
   virtual bool Close(NPReason reason);
 
-  virtual webkit_glue::WebPluginResourceClient* AsResourceClient();
+  virtual WebPluginResourceClient* AsResourceClient();
 
   // Cancels any HTTP requests initiated by the stream.
   virtual void CancelRequest() {}
@@ -151,6 +146,7 @@
   DISALLOW_COPY_AND_ASSIGN(PluginStream);
 };
 
-}  // namespace NPAPI
+}  // namespace npapi
+}  // namespace webkit
 
-#endif  // WEBKIT_GLUE_PLUGINS_PLUGIN_STREAM_H_
+#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_STREAM_H_