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

content/browser/renderer_host/render_widget_host_impl.cc

Index: content/browser/renderer_host/render_widget_host_impl.cc
===================================================================
--- content/browser/renderer_host/render_widget_host_impl.cc	(revision 212369)
+++ content/browser/renderer_host/render_widget_host_impl.cc	(working copy)
@@ -60,8 +60,7 @@
 #include "ui/gfx/vector2d_conversions.h"
 #include "webkit/common/cursors/webcursor.h"
 #include "webkit/common/webpreferences.h"
-#include "webkit/plugins/npapi/webplugin.h"
-#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
+#include "webkit/plugins/npapi/plugin_utils.h"
 
 #if defined(TOOLKIT_GTK)
 #include "content/browser/renderer_host/backing_store_gtk.h"
@@ -72,7 +71,6 @@
 using base::Time;
 using base::TimeDelta;
 using base::TimeTicks;
-using webkit::npapi::WebPluginDelegateImpl;
 using WebKit::WebGestureEvent;
 using WebKit::WebInputEvent;
 using WebKit::WebKeyboardEvent;
@@ -2231,8 +2229,7 @@
 void RenderWidgetHostImpl::OnWindowlessPluginDummyWindowCreated(
     gfx::NativeViewId dummy_activation_window) {
   HWND hwnd = reinterpret_cast<HWND>(dummy_activation_window);
-  if (!IsWindow(hwnd) ||
-      !WebPluginDelegateImpl::IsDummyActivationWindow(hwnd)) {
+  if (!IsWindow(hwnd) || !webkit::npapi::IsDummyActivationWindow(hwnd)) {
     // This may happen as a result of a race condition when the plugin is going
     // away.
     return;
@@ -2593,7 +2590,7 @@
 #if defined(OS_WIN)
   HWND hwnd = reinterpret_cast<HWND>(new_parent);
   if (!hwnd)
-    hwnd = WebPluginDelegateImpl::GetDefaultWindowParent();
+    hwnd = webkit::npapi::GetDefaultWindowParent();
   for (std::list<HWND>::iterator i = dummy_windows_for_activation_.begin();
         i != dummy_windows_for_activation_.end(); ++i) {
     SetParent(*i, hwnd);