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

webkit/glue/plugins/plugin_stream.cc

-// 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.
 
 // TODO : Support NP_ASFILEONLY mode
 // 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.
   CloseTempFile();
   free(const_cast<char*>(stream_.url));
 }
 
 bool PluginStream::Open(const std::string &mime_type,
                         const std::string &headers,
                         uint32 length,
@@ skipping 208 matching lines @@
       // Stream hasn't been closed yet.
       NPError err = instance_->NPP_DestroyStream(&stream_, reason);
       DCHECK(err == NPERR_NO_ERROR);
     }
   }
 
   Notify(reason);
   return true;
 }
 
-WebPluginResourceClient* PluginStream::AsResourceClient() {
+webkit_glue::WebPluginResourceClient* PluginStream::AsResourceClient() {
   return NULL;
 }
 
 void PluginStream::Notify(NPReason reason) {
   if (notify_needed_) {
     instance_->NPP_URLNotify(stream_.url, reason, notify_data_);
     notify_needed_ = false;
   }
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI