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

webkit/glue/plugins/plugin_stream_url.cc

Index: webkit/glue/plugins/plugin_stream_url.cc
diff --git a/webkit/plugins/npapi/plugin_stream_url.cc b/webkit/glue/plugins/plugin_stream_url.cc
similarity index 88%
rename from webkit/plugins/npapi/plugin_stream_url.cc
rename to webkit/glue/plugins/plugin_stream_url.cc
index b7efcdfbb982817ff034a3b34c8c68f8b12e1bd2..7f9f35585b416c5ed609f7ba1ddd9146ba43a0db 100644
--- a/webkit/plugins/npapi/plugin_stream_url.cc
+++ b/webkit/glue/plugins/plugin_stream_url.cc
@@ -2,16 +2,15 @@
 // 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_url.h"
+#include "webkit/glue/plugins/plugin_stream_url.h"
 
 #include "net/http/http_response_headers.h"
-#include "webkit/plugins/npapi/plugin_host.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
-#include "webkit/plugins/npapi/plugin_lib.h"
-#include "webkit/plugins/npapi/webplugin.h"
+#include "webkit/glue/plugins/plugin_host.h"
+#include "webkit/glue/plugins/plugin_instance.h"
+#include "webkit/glue/plugins/plugin_lib.h"
+#include "webkit/glue/plugins/webplugin.h"
 
-namespace webkit {
-namespace npapi {
+namespace NPAPI {
 
 PluginStreamUrl::PluginStreamUrl(
     unsigned long resource_id,
@@ -40,8 +39,8 @@ bool PluginStreamUrl::Close(NPReason reason) {
   return result;
 }
 
-WebPluginResourceClient* PluginStreamUrl::AsResourceClient() {
-  return static_cast<WebPluginResourceClient*>(this);
+webkit_glue::WebPluginResourceClient* PluginStreamUrl::AsResourceClient() {
+  return static_cast<webkit_glue::WebPluginResourceClient*>(this);
 }
 
 void PluginStreamUrl::WillSendRequest(const GURL& url, int http_status_code) {
@@ -128,5 +127,4 @@ void PluginStreamUrl::CancelRequest() {
   }
 }
 
-}  // namespace npapi
-}  // namespace webkit
+} // namespace NPAPI