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

webkit/glue/plugins/plugin_stream.cc

Index: webkit/glue/plugins/plugin_stream.cc
diff --git a/webkit/plugins/npapi/plugin_stream.cc b/webkit/glue/plugins/plugin_stream.cc
similarity index 95%
rename from webkit/plugins/npapi/plugin_stream.cc
rename to webkit/glue/plugins/plugin_stream.cc
index fee63eba134a4d52461789189da51ccc0bb232e7..e465e2dc3b01dd6a74ff58709a91a725083bba8c 100644
--- a/webkit/plugins/npapi/plugin_stream.cc
+++ b/webkit/glue/plugins/plugin_stream.cc
@@ -1,4 +1,4 @@
-// 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.
 
@@ -6,17 +6,16 @@
 // TODO : Support NP_SEEK mode
 // TODO : Support SEEKABLE=true in NewStream
 
-#include "webkit/plugins/npapi/plugin_stream.h"
+#include "webkit/glue/plugins/plugin_stream.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "net/base/mime_util.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
+#include "webkit/glue/plugins/plugin_instance.h"
 #include "googleurl/src/gurl.h"
 
-namespace webkit {
-namespace npapi {
+namespace NPAPI {
 
 PluginStream::~PluginStream() {
   // always close our temporary files.
@@ -245,7 +244,7 @@ bool PluginStream::Close(NPReason reason) {
   return true;
 }
 
-WebPluginResourceClient* PluginStream::AsResourceClient() {
+webkit_glue::WebPluginResourceClient* PluginStream::AsResourceClient() {
   return NULL;
 }
 
@@ -256,5 +255,4 @@ void PluginStream::Notify(NPReason reason) {
   }
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI