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

webkit/plugins/npapi/webplugin_impl.cc

Index: webkit/plugins/npapi/webplugin_impl.cc
===================================================================
--- webkit/plugins/npapi/webplugin_impl.cc	(revision 0)
+++ webkit/plugins/npapi/webplugin_impl.cc	(working copy)
@@ -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/glue/plugins/webplugin_impl.h"
+#include "webkit/plugins/npapi/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/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"
+#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"
 
 using appcache::WebApplicationCacheHostImpl;
 using WebKit::WebCanvas;
@@ -73,7 +73,9 @@
 using WebKit::WebView;
 using webkit_glue::MultipartResponseDelegate;
 
-namespace webkit_glue {
+namespace webkit {
+namespace npapi {
+
 namespace {
 
 // This class handles individual multipart responses. It is instantiated when
@@ -601,7 +603,7 @@
   std::vector<std::string> names;
   std::vector<std::string> values;
   std::vector<char> body;
-  bool rv = NPAPI::PluginHost::SetPostData(buf, length, &names, &values, &body);
+  bool rv = PluginHost::SetPostData(buf, length, &names, &values, &body);
 
   for (size_t i = 0; i < names.size(); ++i) {
     request->addHTTPHeaderField(WebString::fromUTF8(names[i]),
@@ -1390,4 +1392,5 @@
   return view->devToolsAgent();
 }
 
-}  // namespace webkit_glue
+}  // namespace npapi
+}  // namespace webkit