Move NPAPI implementation out of webkit/plugins/npapi and into content.

content/renderer/webplugin_impl.cc

Index: content/renderer/webplugin_impl.cc
===================================================================
--- content/renderer/webplugin_impl.cc	(revision 212369)
+++ content/renderer/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/plugins/npapi/webplugin_impl.h"
+#include "content/renderer/webplugin_impl.h"
 
 #include "base/bind.h"
 #include "base/debug/crash_logging.h"
@@ -13,6 +13,10 @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "cc/layers/io_surface_layer.h"
+#include "content/child/npapi/plugin_host.h"
+#include "content/child/npapi/plugin_instance.h"
+#include "content/child/npapi/webplugin_delegate.h"
+#include "content/renderer/webplugin_page_delegate.h"
 #include "net/base/escape.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_response_headers.h"
@@ -41,10 +45,6 @@
 #include "url/gurl.h"
 #include "url/url_util.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/plugins/plugin_constants.h"
 #include "webkit/renderer/appcache/web_application_cache_host_impl.h"
 #include "webkit/renderer/compositor_bindings/web_layer_impl.h"
@@ -78,8 +78,7 @@
 using WebKit::WebView;
 using webkit_glue::MultipartResponseDelegate;
 
-namespace webkit {
-namespace npapi {
+namespace content {
 
 namespace {
 
@@ -1444,5 +1443,4 @@
   }
 }
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace content