Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put...

webkit/plugins/npapi/plugin_instance.cc

Index: webkit/plugins/npapi/plugin_instance.cc
===================================================================
--- webkit/plugins/npapi/plugin_instance.cc	(revision 0)
+++ webkit/plugins/npapi/plugin_instance.cc	(working copy)
@@ -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/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 "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 "net/base/escape.h"
 
 #if defined(OS_MACOSX)
 #include <ApplicationServices/ApplicationServices.h>
 #endif
 
-namespace NPAPI {
+namespace webkit {
+namespace npapi {
 
 PluginInstance::PluginInstance(PluginLib *plugin, const std::string &mime_type)
     : plugin_(plugin),
@@ -130,7 +130,7 @@
   in_close_streams_ = false;
 }
 
-webkit_glue::WebPluginResourceClient* PluginInstance::GetRangeRequest(
+WebPluginResourceClient* PluginInstance::GetRangeRequest(
     int id) {
   PendingRangeRequestMap::iterator iter = pending_range_requests_.find(id);
   if (iter == pending_range_requests_.end()) {
@@ -138,7 +138,7 @@
     return NULL;
   }
 
-  webkit_glue::WebPluginResourceClient* rv = iter->second->AsResourceClient();
+  WebPluginResourceClient* rv = iter->second->AsResourceClient();
   pending_range_requests_.erase(iter);
   return rv;
 }
@@ -665,7 +665,7 @@
           stream_index != open_streams_.end(); ++stream_index) {
     PluginStream* plugin_stream = *stream_index;
     if (plugin_stream->notify_data() == notify_data) {
-      webkit_glue::WebPluginResourceClient* resource_client =
+      WebPluginResourceClient* resource_client =
           plugin_stream->AsResourceClient();
       webplugin_->URLRedirectResponse(allow, resource_client->ResourceId());
       if (allow) {
@@ -677,4 +677,5 @@
   }
 }
 
-}  // namespace NPAPI
+}  // namespace npapi
+}  // namespace webkit