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

webkit/glue/plugins/plugin_stream_posix.cc

Index: webkit/glue/plugins/plugin_stream_posix.cc
diff --git a/webkit/plugins/npapi/plugin_stream_posix.cc b/webkit/glue/plugins/plugin_stream_posix.cc
similarity index 90%
rename from webkit/plugins/npapi/plugin_stream_posix.cc
rename to webkit/glue/plugins/plugin_stream_posix.cc
index 7a89ff12987151c636539651b98ad19377828027..d0e2291255c8078568e7dead8a2f987d4939b06c 100644
--- a/webkit/plugins/npapi/plugin_stream_posix.cc
+++ b/webkit/glue/plugins/plugin_stream_posix.cc
@@ -2,17 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/plugins/npapi/plugin_stream.h"
+#include "webkit/glue/plugins/plugin_stream.h"
 
 #include <string.h>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
+#include "webkit/glue/plugins/plugin_instance.h"
 
-namespace webkit {
-namespace npapi {
+namespace NPAPI {
 
 PluginStream::PluginStream(
     PluginInstance *instance,
@@ -72,5 +71,4 @@ bool PluginStream::TempFileIsValid() {
   return temp_file_ != NULL;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI