Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi and put...

chrome/renderer/render_view.cc

Index: chrome/renderer/render_view.cc
===================================================================
--- chrome/renderer/render_view.cc	(revision 69426)
+++ chrome/renderer/render_view.cc	(working copy)
@@ -174,18 +174,18 @@
 #include "webkit/glue/media/simple_data_source.h"
 #include "webkit/glue/media/video_renderer_impl.h"
 #include "webkit/glue/password_form_dom_manager.h"
-#include "webkit/glue/plugins/default_plugin_shared.h"
-#include "webkit/glue/plugins/plugin_list.h"
-#include "webkit/glue/plugins/webplugin_delegate.h"
-#include "webkit/glue/plugins/webplugin_delegate_impl.h"
-#include "webkit/glue/plugins/webplugin_impl.h"
-#include "webkit/glue/plugins/webview_plugin.h"
 #include "webkit/glue/resource_fetcher.h"
 #include "webkit/glue/site_isolation_metrics.h"
 #include "webkit/glue/webaccessibility.h"
 #include "webkit/glue/webdropdata.h"
 #include "webkit/glue/webkit_glue.h"
 #include "webkit/glue/webmediaplayer_impl.h"
+#include "webkit/plugins/npapi/default_plugin_shared.h"
+#include "webkit/plugins/npapi/plugin_list.h"
+#include "webkit/plugins/npapi/webplugin_delegate.h"
+#include "webkit/plugins/npapi/webplugin_delegate_impl.h"
+#include "webkit/plugins/npapi/webplugin_impl.h"
+#include "webkit/plugins/npapi/webview_plugin.h"
 #include "webkit/plugins/ppapi/ppapi_webplugin_impl.h"
 
 #if defined(OS_WIN)
@@ -835,7 +835,7 @@
 
 WebPlugin* RenderView::CreatePluginNoCheck(WebFrame* frame,
                                            const WebPluginParams& params) {
-  WebPluginInfo info;
+  webkit::npapi::WebPluginInfo info;
   bool found;
   ContentSetting setting;
   std::string mime_type;
@@ -2747,7 +2747,7 @@
   bool found = false;
   ContentSetting plugin_setting = CONTENT_SETTING_DEFAULT;
   CommandLine* cmd = CommandLine::ForCurrentProcess();
-  WebPluginInfo info;
+  webkit::npapi::WebPluginInfo info;
   GURL url(params.url);
   std::string actual_mime_type;
   Send(new ViewHostMsg_GetPluginInfo(url,
@@ -2762,8 +2762,8 @@
     return NULL;
   DCHECK(plugin_setting != CONTENT_SETTING_DEFAULT);
 
-  const PluginGroup* group =
-      NPAPI::PluginList::Singleton()->GetPluginGroup(info);
+  const webkit::npapi::PluginGroup* group =
+      webkit::npapi::PluginList::Singleton()->GetPluginGroup(info);
   DCHECK(group != NULL);
 
   if (!info.enabled) {
@@ -2779,7 +2779,7 @@
 
   ContentSetting host_setting =
       current_content_settings_.settings[CONTENT_SETTINGS_TYPE_PLUGINS];
-  if (info.path.value() == kDefaultPluginLibraryName ||
+  if (info.path.value() == webkit::npapi::kDefaultPluginLibraryName ||
       plugin_setting == CONTENT_SETTING_ALLOW ||
       host_setting == CONTENT_SETTING_ALLOW) {
     scoped_refptr<webkit::ppapi::PluginModule> pepper_module(
@@ -3942,7 +3942,7 @@
 
 // webkit_glue::WebPluginPageDelegate -----------------------------------------
 
-webkit_glue::WebPluginDelegate* RenderView::CreatePluginDelegate(
+webkit::npapi::WebPluginDelegate* RenderView::CreatePluginDelegate(
     const FilePath& file_path,
     const std::string& mime_type) {
   if (!PluginChannelHost::IsListening())
@@ -4037,7 +4037,7 @@
   CleanupWindowInPluginMoves(window);
 }
 
-void RenderView::DidMovePlugin(const webkit_glue::WebPluginGeometry& move) {
+void RenderView::DidMovePlugin(const webkit::npapi::WebPluginGeometry& move) {
   SchedulePluginMove(move);
 }
 
@@ -4439,18 +4439,19 @@
       pepper_module, params, pepper_delegate_.AsWeakPtr());
 }
 
-WebPlugin* RenderView::CreateNPAPIPlugin(WebFrame* frame,
-                                         const WebPluginParams& params,
-                                         const FilePath& path,
-                                         const std::string& mime_type) {
-  return new webkit_glue::WebPluginImpl(
+WebPlugin* RenderView::CreateNPAPIPlugin(
+    WebFrame* frame,
+    const WebPluginParams& params,
+    const FilePath& path,
+    const std::string& mime_type) {
+  return new webkit::npapi::WebPluginImpl(
       frame, params, path, mime_type, AsWeakPtr());
 }
 
 WebPlugin* RenderView::CreateOutdatedPluginPlaceholder(
     WebFrame* frame,
     const WebPluginParams& params,
-    const PluginGroup& group) {
+    const webkit::npapi::PluginGroup& group) {
   int resource_id = IDR_OUTDATED_PLUGIN_HTML;
   const base::StringPiece template_html(
       ResourceBundle::GetSharedInstance().GetRawDataResource(resource_id));
@@ -4467,7 +4468,7 @@
   std::string htmlData = jstemplate_builder::GetTemplatesHtml(
       template_html, &values, "t");
 
-  return WebViewPlugin::Create(NULL,
+  return webkit::npapi::WebViewPlugin::Create(NULL,
                                webkit_preferences_,
                                htmlData,
                                GURL("chrome://outdatedplugin/"));