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

content/plugin/webplugin_accelerated_surface_proxy_mac.h

Index: content/plugin/webplugin_accelerated_surface_proxy_mac.h
===================================================================
--- content/plugin/webplugin_accelerated_surface_proxy_mac.h	(revision 212369)
+++ content/plugin/webplugin_accelerated_surface_proxy_mac.h	(working copy)
@@ -6,8 +6,8 @@
 #define CONTENT_PLUGIN_WEBPLUGIN_ACCELERATED_SURFACE_PROXY_H_
 
 #include "base/compiler_specific.h"
+#include "content/child/npapi/webplugin_accelerated_surface_mac.h"
 #include "ui/gl/gpu_preference.h"
-#include "webkit/plugins/npapi/webplugin_accelerated_surface_mac.h"
 
 class AcceleratedSurface;
 
@@ -16,8 +16,7 @@
 
 // Out-of-process implementation of WebPluginAcceleratedSurface that proxies
 // calls through a WebPluginProxy.
-class WebPluginAcceleratedSurfaceProxy
-    : public webkit::npapi::WebPluginAcceleratedSurface {
+class WebPluginAcceleratedSurfaceProxy : public WebPluginAcceleratedSurface {
  public:
   // Creates a new WebPluginAcceleratedSurfaceProxy that uses plugin_proxy
   // to proxy calls. plugin_proxy must outlive this object. Returns NULL if