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

webkit/glue/plugins/plugin_instance.cc

Index: webkit/glue/plugins/plugin_instance.cc
diff --git a/webkit/plugins/npapi/plugin_instance.cc b/webkit/glue/plugins/plugin_instance.cc
similarity index 97%
rename from webkit/plugins/npapi/plugin_instance.cc
rename to webkit/glue/plugins/plugin_instance.cc
index 6f65456a6d6523f800c481e12e28a92acde85c58..4ccbadfdc861d5d8647f25d4d3ab5550e427a4bc 100644
--- a/webkit/plugins/npapi/plugin_instance.cc
+++ b/webkit/glue/plugins/plugin_instance.cc
@@ -2,28 +2,28 @@
 // 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_instance.h"
-
 #include "build/build_config.h"
+
+#include "webkit/glue/plugins/plugin_instance.h"
+
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/plugins/npapi/plugin_host.h"
-#include "webkit/plugins/npapi/plugin_lib.h"
-#include "webkit/plugins/npapi/plugin_stream_url.h"
-#include "webkit/plugins/npapi/plugin_string_stream.h"
-#include "webkit/plugins/npapi/webplugin.h"
-#include "webkit/plugins/npapi/webplugin_delegate.h"
+#include "webkit/glue/plugins/plugin_host.h"
+#include "webkit/glue/plugins/plugin_lib.h"
+#include "webkit/glue/plugins/plugin_stream_url.h"
+#include "webkit/glue/plugins/plugin_string_stream.h"
+#include "webkit/glue/plugins/webplugin.h"
+#include "webkit/glue/plugins/webplugin_delegate.h"
 #include "net/base/escape.h"
 
 #if defined(OS_MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 
-namespace webkit {
-namespace npapi {
+namespace NPAPI {
 
 PluginInstance::PluginInstance(PluginLib *plugin, const std::string &mime_type)
     : plugin_(plugin),
@@ -130,7 +130,7 @@ void PluginInstance::CloseStreams() {
   in_close_streams_ = false;
 }
 
-WebPluginResourceClient* PluginInstance::GetRangeRequest(
+webkit_glue::WebPluginResourceClient* PluginInstance::GetRangeRequest(
     int id) {
   PendingRangeRequestMap::iterator iter = pending_range_requests_.find(id);
   if (iter == pending_range_requests_.end()) {
@@ -138,7 +138,7 @@ WebPluginResourceClient* PluginInstance::GetRangeRequest(
     return NULL;
   }
 
-  WebPluginResourceClient* rv = iter->second->AsResourceClient();
+  webkit_glue::WebPluginResourceClient* rv = iter->second->AsResourceClient();
   pending_range_requests_.erase(iter);
   return rv;
 }
@@ -665,7 +665,7 @@ void PluginInstance::URLRedirectResponse(bool allow, void* notify_data) {
           stream_index != open_streams_.end(); ++stream_index) {
     PluginStream* plugin_stream = *stream_index;
     if (plugin_stream->notify_data() == notify_data) {
-      WebPluginResourceClient* resource_client =
+      webkit_glue::WebPluginResourceClient* resource_client =
           plugin_stream->AsResourceClient();
       webplugin_->URLRedirectResponse(allow, resource_client->ResourceId());
       if (allow) {
@@ -677,5 +677,4 @@ void PluginInstance::URLRedirectResponse(bool allow, void* notify_data) {
   }
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI