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

webkit/glue/plugins/webplugin_impl.cc

Index: webkit/glue/plugins/webplugin_impl.cc
diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/glue/plugins/webplugin_impl.cc
similarity index 99%
rename from webkit/plugins/npapi/webplugin_impl.cc
rename to webkit/glue/plugins/webplugin_impl.cc
index 97c2f28f6f7f775b346dbcf299b238e23a2626af..666775b1dde04808d0c04d4feaf337a0cfc9b18e 100644
--- a/webkit/plugins/npapi/webplugin_impl.cc
+++ b/webkit/glue/plugins/webplugin_impl.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/plugins/npapi/webplugin_impl.h"
+#include "webkit/glue/plugins/webplugin_impl.h"
 
 #include "base/linked_ptr.h"
 #include "base/logging.h"
@@ -39,10 +39,10 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/appcache/web_application_cache_host_impl.h"
 #include "webkit/glue/multipart_response_delegate.h"
-#include "webkit/plugins/npapi/plugin_host.h"
-#include "webkit/plugins/npapi/plugin_instance.h"
-#include "webkit/plugins/npapi/webplugin_delegate.h"
-#include "webkit/plugins/npapi/webplugin_page_delegate.h"
+#include "webkit/glue/plugins/plugin_host.h"
+#include "webkit/glue/plugins/plugin_instance.h"
+#include "webkit/glue/plugins/webplugin_delegate.h"
+#include "webkit/glue/plugins/webplugin_page_delegate.h"
 
 using appcache::WebApplicationCacheHostImpl;
 using WebKit::WebCanvas;
@@ -73,9 +73,7 @@ using WebKit::WebVector;
 using WebKit::WebView;
 using webkit_glue::MultipartResponseDelegate;
 
-namespace webkit {
-namespace npapi {
-
+namespace webkit_glue {
 namespace {
 
 // This class handles individual multipart responses. It is instantiated when
@@ -603,7 +601,7 @@ bool WebPluginImpl::SetPostData(WebURLRequest* request,
   std::vector<std::string> names;
   std::vector<std::string> values;
   std::vector<char> body;
-  bool rv = PluginHost::SetPostData(buf, length, &names, &values, &body);
+  bool rv = NPAPI::PluginHost::SetPostData(buf, length, &names, &values, &body);
 
   for (size_t i = 0; i < names.size(); ++i) {
     request->addHTTPHeaderField(WebString::fromUTF8(names[i]),
@@ -1392,5 +1390,4 @@ WebDevToolsAgent* WebPluginImpl::GetDevToolsAgent() {
   return view->devToolsAgent();
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue