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

webkit/glue/plugins/plugin_stream_url.cc

 // Copyright (c) 2010 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_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,
     const GURL &url,
     PluginInstance *instance,
     bool notify_needed,
     void *notify_data)
     : PluginStream(instance, url.spec().c_str(), notify_needed, notify_data),
       url_(url),
       id_(resource_id) {
 }
 
 PluginStreamUrl::~PluginStreamUrl() {
   if (instance() && instance()->webplugin()) {
     instance()->webplugin()->ResourceClientDeleted(AsResourceClient());
   }
 }
 
 bool PluginStreamUrl::Close(NPReason reason) {
   // Protect the stream against it being destroyed or the whole plugin instance
   // being destroyed within the destroy stream handler.
   scoped_refptr<PluginStream> protect(this);
   CancelRequest();
   bool result = PluginStream::Close(reason);
   instance()->RemoveStream(this);
   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) {
   if (notify_needed()) {
     // If the plugin participates in HTTP url redirect handling then notify it.
     if (net::HttpResponseHeaders::IsRedirectResponseCode(http_status_code) &&
         instance()->handles_url_redirects()) {
       pending_redirect_url_ = url.spec();
       instance()->NPP_URLRedirectNotify(url.spec().c_str(), http_status_code,
           notify_data());
@@ skipping 66 matching lines @@
 
 void PluginStreamUrl::CancelRequest() {
   if (id_ > 0) {
     if (instance()->webplugin()) {
       instance()->webplugin()->CancelResource(id_);
     }
     id_ = 0;
   }
 }
 
-}  // namespace npapi
-}  // namespace webkit
+} // namespace NPAPI