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

Notes:
-gtk_plugin_container_manager* and gtk_plugin_container* move to content/browser/renderer_host/ since that's all where they're used
-plugin_list* and plugin_constants_win* move to content/common as they're used by child processes and the browser
-webplugin_impl* and webplugin_page_delegate.h move to content/renderer as that's where they're used. I will remove webplugin_page_delegate.h in a followup change as it's no longer needed.
-the rest moves to content/child/npapi
-a few constants moved from plugin_constants_win.h to plugin_util.h temporarily

BUG=237249
TBR=scottmg

Review URL: https://codereview.chromium.org/19761007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212485 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 3 insertions, 4 deletions

diff --git a/content/plugin/plugin_interpose_util_mac.mm b/content/plugin/plugin_interpose_util_mac.mm
index 1166e6c..62cef3a 100644
--- a/content/plugin/plugin_interpose_util_mac.mm
+++ b/content/plugin/plugin_interpose_util_mac.mm
@@ -7,9 +7,9 @@
 #import <AppKit/AppKit.h>
 #import <objc/runtime.h>
 
+#include "content/child/npapi/webplugin_delegate_impl.h"
 #include "content/common/plugin_process_messages.h"
 #include "content/plugin/plugin_thread.h"
-#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
 
 using content::PluginThread;
 
@@ -34,7 +34,7 @@ void SwitchToPluginProcess() {
 
 __attribute__((visibility("default")))
 OpaquePluginRef GetActiveDelegate() {
-  return webkit::npapi::WebPluginDelegateImpl::GetActiveDelegate();
+  return content::WebPluginDelegateImpl::GetActiveDelegate();
 }
 
 __attribute__((visibility("default")))
@@ -211,8 +211,7 @@ static void OnPluginWindowShown(const WindowInfo& window_info, BOOL is_modal) {
 - (void)chromePlugin_set {
   OpaquePluginRef delegate = mac_plugin_interposing::GetActiveDelegate();
   if (delegate) {
-    static_cast<webkit::npapi::WebPluginDelegateImpl*>(delegate)->SetNSCursor(
-        self);
+    static_cast<content::WebPluginDelegateImpl*>(delegate)->SetNSCursor(self);
     return;
   }
   [self chromePlugin_set];