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

webkit/glue/plugins/plugin_instance.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_instance.h"
+#include "build/build_config.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),
       npp_(0),
       host_(PluginHost::Singleton()),
       npp_functions_(plugin->functions()),
       window_handle_(0),
       windowless_(false),
       transparent_(true),
       webplugin_(0),
@@ skipping 86 matching lines @@
 void PluginInstance::CloseStreams() {
   in_close_streams_ = true;
   for (unsigned int index = 0; index < open_streams_.size(); ++index) {
     // Close all streams on the way down.
     open_streams_[index]->Close(NPRES_USER_BREAK);
   }
   open_streams_.clear();
   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()) {
     NOTREACHED();
     return NULL;
   }
 
-  WebPluginResourceClient* rv = iter->second->AsResourceClient();
+  webkit_glue::WebPluginResourceClient* rv = iter->second->AsResourceClient();
   pending_range_requests_.erase(iter);
   return rv;
 }
 
 bool PluginInstance::Start(const GURL& url,
                            char** const param_names,
                            char** const param_values,
                            int param_count,
                            bool load_manually) {
   load_manually_ = load_manually;
@@ skipping 506 matching lines @@
   }
 }
 
 void PluginInstance::URLRedirectResponse(bool allow, void* notify_data) {
   // The notify_data passed in allows us to identify the matching stream.
   std::vector<scoped_refptr<PluginStream> >::iterator stream_index;
   for (stream_index = open_streams_.begin();
           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) {
         plugin_stream->UpdateUrl(
             plugin_stream->pending_redirect_url().c_str());
       }
       break;
     }
   }
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI