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

webkit/glue/plugins/plugin_stream_win.cc

Index: webkit/glue/plugins/plugin_stream_win.cc
diff --git a/webkit/plugins/npapi/plugin_stream_win.cc b/webkit/glue/plugins/plugin_stream_win.cc
similarity index 91%
rename from webkit/plugins/npapi/plugin_stream_win.cc
rename to webkit/glue/plugins/plugin_stream_win.cc
index edc977057e1b424b32be42c0c81b9bea6356c321..0b6fcbd42389745616fda8a51e8605ee3d6fb213 100644
--- a/webkit/plugins/npapi/plugin_stream_win.cc
+++ b/webkit/glue/plugins/plugin_stream_win.cc
@@ -1,14 +1,13 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
-#include "webkit/plugins/npapi/plugin_stream.h"
+#include "webkit/glue/plugins/plugin_stream.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,
@@ -95,5 +94,4 @@ bool PluginStream::TempFileIsValid() {
   return temp_file_handle_ != INVALID_HANDLE_VALUE;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI