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

webkit/glue/plugins/plugin_stream_posix.cc

 // 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 <string.h>
 
 #include "base/file_path.h"
 #include "base/file_util.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,
     const char *url,
     bool need_notify,
     void *notify_data)
     : instance_(instance),
       notify_needed_(need_notify),
       notify_data_(notify_data),
       close_on_write_data_(false),
@@ skipping 39 matching lines @@
 
 void PluginStream::CloseTempFile() {
   file_util::CloseFile(temp_file_);
   temp_file_ = NULL;
 }
 
 bool PluginStream::TempFileIsValid() {
   return temp_file_ != NULL;
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI