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

webkit/glue/plugins/plugin_string_stream.h

 // 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_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;
 
 // An NPAPI stream from a string.
 class PluginStringStream : public PluginStream {
  public:
   // Create a new stream for sending to the plugin.
   // If notify_needed, will notify the plugin after the data has
   // all been sent.
   PluginStringStream(PluginInstance* instance,
                      const GURL& url,
                      bool notify_needed,
                      void* notify_data);
 
   // Initiates the sending of data to the plugin.
   void SendToPlugin(const std::string& data,
                     const std::string& mime_type);
 
  private:
   virtual ~PluginStringStream();
 
   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_