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

content/renderer/webplugin_impl.h

Index: content/renderer/webplugin_impl.h
===================================================================
--- content/renderer/webplugin_impl.h	(revision 212369)
+++ content/renderer/webplugin_impl.h	(working copy)
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IMPL_H_
-#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IMPL_H_
+#ifndef CONTENT_RENDERER_WEBPLUGIN_IMPL_H_
+#define CONTENT_RENDERER_WEBPLUGIN_IMPL_H_
 
 #include <map>
 #include <string>
@@ -13,6 +13,9 @@
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "content/child/npapi/webplugin.h"
+#include "content/common/content_export.h"
+#include "content/common/webplugin_geometry.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebURLLoaderClient.h"
@@ -21,8 +24,6 @@
 #include "third_party/WebKit/public/web/WebPlugin.h"
 #include "ui/gfx/native_widget_types.h"
 #include "url/gurl.h"
-#include "webkit/plugins/npapi/webplugin.h"
-#include "webkit/plugins/webkit_plugins_export.h"
 
 namespace cc {
 class IOSurfaceLayer;
@@ -41,8 +42,7 @@
 class MultipartResponseDelegate;
 }  // namespace webkit_glue
 
-namespace webkit {
-namespace npapi {
+namespace content {
 
 class WebPluginDelegate;
 class WebPluginPageDelegate;
@@ -50,10 +50,9 @@
 // This is the WebKit side of the plugin implementation that forwards calls,
 // after changing out of WebCore types, to a delegate.  The delegate may
 // be in a different process.
-class WEBKIT_PLUGINS_EXPORT WebPluginImpl :
-    NON_EXPORTED_BASE(public WebPlugin),
-    NON_EXPORTED_BASE(public WebKit::WebPlugin),
-    NON_EXPORTED_BASE(public WebKit::WebURLLoaderClient) {
+class WebPluginImpl : public WebPlugin,
+                      public WebKit::WebPlugin,
+                      public WebKit::WebURLLoaderClient {
  public:
   WebPluginImpl(
       WebKit::WebFrame* frame,
@@ -63,9 +62,9 @@
   virtual ~WebPluginImpl();
 
   // Helper function for sorting post data.
-  static bool SetPostData(WebKit::WebURLRequest* request,
-                          const char* buf,
-                          uint32 length);
+  CONTENT_EXPORT static bool SetPostData(WebKit::WebURLRequest* request,
+                                         const char* buf,
+                                         uint32 length);
 
   virtual WebPluginDelegate* delegate();
 
@@ -336,7 +335,6 @@
   DISALLOW_COPY_AND_ASSIGN(WebPluginImpl);
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace content
 
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_IMPL_H_
+#endif  // CONTENT_RENDERER_WEBPLUGIN_IMPL_H_