Move webplugininfo.h to content/public.

BUG=237249
TBR=scottmg

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

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

9 files changed, 23 insertions, 24 deletions

diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.cc b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
index e44aed1..d489f49 100644
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.cc
@@ -35,6 +35,7 @@
 #include "content/public/common/context_menu_params.h"
 #include "content/public/common/media_stream_request.h"
 #include "content/public/common/referrer.h"
+#include "content/public/common/webplugininfo.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/renderer_restrict_dispatch_group.h"
 #include "content/renderer/gamepad_shared_memory_reader.h"
@@ -101,7 +102,6 @@
 #include "webkit/plugins/ppapi/ppb_tcp_server_socket_private_impl.h"
 #include "webkit/plugins/ppapi/ppb_tcp_socket_private_impl.h"
 #include "webkit/plugins/ppapi/resource_helper.h"
-#include "webkit/plugins/webplugininfo.h"
 
 using WebKit::WebView;
 using WebKit::WebFrame;
@@ -306,7 +306,7 @@ void DidFailOpenFileSystemURL(
 
 void CreateHostForInProcessModule(RenderViewImpl* render_view,
                                   webkit::ppapi::PluginModule* module,
-                                  const webkit::WebPluginInfo& webplugin_info) {
+                                  const WebPluginInfo& webplugin_info) {
   // First time an in-process plugin was used, make a host for it.
   const PepperPluginInfo* info =
       PepperPluginRegistry::GetInstance()->GetInfoForPlugin(webplugin_info);
@@ -347,7 +347,7 @@ PepperPluginDelegateImpl::~PepperPluginDelegateImpl() {
 }
 
 WebKit::WebPlugin* PepperPluginDelegateImpl::CreatePepperWebPlugin(
-    const webkit::WebPluginInfo& webplugin_info,
+    const WebPluginInfo& webplugin_info,
     const WebKit::WebPluginParams& params) {
   bool pepper_plugin_was_registered = false;
   scoped_refptr<webkit::ppapi::PluginModule> pepper_module(
@@ -365,7 +365,7 @@ WebKit::WebPlugin* PepperPluginDelegateImpl::CreatePepperWebPlugin(
 
 scoped_refptr<webkit::ppapi::PluginModule>
 PepperPluginDelegateImpl::CreatePepperPluginModule(
-    const webkit::WebPluginInfo& webplugin_info,
+    const WebPluginInfo& webplugin_info,
     bool* pepper_plugin_was_registered) {
   *pepper_plugin_was_registered = true;
 
diff --git a/content/renderer/pepper/pepper_plugin_delegate_impl.h b/content/renderer/pepper/pepper_plugin_delegate_impl.h
index 66b5ba8..139d892 100644
--- a/content/renderer/pepper/pepper_plugin_delegate_impl.h
+++ b/content/renderer/pepper/pepper_plugin_delegate_impl.h
@@ -41,7 +41,6 @@ class PpapiPermissions;
 }
 
 namespace webkit {
-struct WebPluginInfo;
 namespace ppapi {
 class PluginInstance;
 class PluginModule;
@@ -59,6 +58,7 @@ class GamepadSharedMemoryReader;
 class PepperBrokerImpl;
 class PepperDeviceEnumerationEventHandler;
 class RenderViewImpl;
+struct WebPluginInfo;
 
 class PepperPluginDelegateImpl
     : public webkit::ppapi::PluginDelegate,
@@ -114,7 +114,7 @@ class PepperPluginDelegateImpl
  private:
   // RenderViewPepperHelper implementation.
   virtual WebKit::WebPlugin* CreatePepperWebPlugin(
-    const webkit::WebPluginInfo& webplugin_info,
+    const WebPluginInfo& webplugin_info,
     const WebKit::WebPluginParams& params) OVERRIDE;
   virtual void ViewWillInitiatePaint() OVERRIDE;
   virtual void ViewInitiatedPaint() OVERRIDE;
@@ -385,9 +385,8 @@ class PepperPluginDelegateImpl
   // |*pepper_plugin_was_registered| will be set to true and the caller should
   // not fall back on any other plugin types.
   scoped_refptr<webkit::ppapi::PluginModule>
-  CreatePepperPluginModule(
-      const webkit::WebPluginInfo& webplugin_info,
-      bool* pepper_plugin_was_registered);
+  CreatePepperPluginModule(const WebPluginInfo& webplugin_info,
+                           bool* pepper_plugin_was_registered);
 
   // Asynchronously attempts to create a PPAPI broker for the given plugin.
   scoped_refptr<PepperBrokerImpl> CreateBroker(
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index 59370f3..288b405 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1134,7 +1134,7 @@ void RenderViewImpl::UnregisterPluginDelegate(
 bool RenderViewImpl::GetPluginInfo(const GURL& url,
                                    const GURL& page_url,
                                    const std::string& mime_type,
-                                   webkit::WebPluginInfo* plugin_info,
+                                   WebPluginInfo* plugin_info,
                                    std::string* actual_mime_type) {
   bool found = false;
   Send(new ViewHostMsg_GetPluginInfo(
@@ -2830,7 +2830,7 @@ WebKit::WebPlugin* RenderViewImpl::createPlugin(WebFrame* frame,
     return GetBrowserPluginManager()->CreateBrowserPlugin(this, frame, params);
   }
 
-  webkit::WebPluginInfo info;
+  WebPluginInfo info;
   std::string mime_type;
   bool found = GetPluginInfo(params.url, frame->top()->document().url(),
                              params.mimeType.utf8(), &info, &mime_type);
@@ -4681,7 +4681,7 @@ bool RenderViewImpl::IsEditableNode(const WebNode& node) const {
 
 WebKit::WebPlugin* RenderViewImpl::CreatePlugin(
     WebKit::WebFrame* frame,
-    const webkit::WebPluginInfo& info,
+    const WebPluginInfo& info,
     const WebKit::WebPluginParams& params) {
   WebKit::WebPlugin* pepper_webplugin =
       pepper_helper_->CreatePepperWebPlugin(info, params);
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 3c4c3e9..6e0e87d0 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -347,7 +347,7 @@ class CONTENT_EXPORT RenderViewImpl
   bool GetPluginInfo(const GURL& url,
                      const GURL& page_url,
                      const std::string& mime_type,
-                     webkit::WebPluginInfo* plugin_info,
+                     WebPluginInfo* plugin_info,
                      std::string* actual_mime_type);
 
   void TransferActiveWheelFlingAnimation(
@@ -712,7 +712,7 @@ class CONTENT_EXPORT RenderViewImpl
   virtual bool IsEditableNode(const WebKit::WebNode& node) const OVERRIDE;
   virtual WebKit::WebPlugin* CreatePlugin(
       WebKit::WebFrame* frame,
-      const webkit::WebPluginInfo& info,
+      const WebPluginInfo& info,
       const WebKit::WebPluginParams& params) OVERRIDE;
   virtual void EvaluateScript(const string16& frame_xpath,
                               const string16& jscript,
diff --git a/content/renderer/render_view_pepper_helper.cc b/content/renderer/render_view_pepper_helper.cc
index f69ca4f..c2f701b 100644
--- a/content/renderer/render_view_pepper_helper.cc
+++ b/content/renderer/render_view_pepper_helper.cc
@@ -12,7 +12,7 @@ RenderViewPepperHelper::~RenderViewPepperHelper() {
 }
 
 WebKit::WebPlugin* RenderViewPepperHelper::CreatePepperWebPlugin(
-    const webkit::WebPluginInfo& webplugin_info,
+    const WebPluginInfo& webplugin_info,
     const WebKit::WebPluginParams& params) {
   return NULL;
 }
diff --git a/content/renderer/render_view_pepper_helper.h b/content/renderer/render_view_pepper_helper.h
index 2a81945..14e22ef 100644
--- a/content/renderer/render_view_pepper_helper.h
+++ b/content/renderer/render_view_pepper_helper.h
@@ -31,7 +31,6 @@ class Range;
 }
 
 namespace webkit {
-struct WebPluginInfo;
 namespace ppapi {
 class PluginInstance;
 }
@@ -44,6 +43,7 @@ class WebPlugin;
 }
 
 namespace content {
+struct WebPluginInfo;
 
 class CONTENT_EXPORT RenderViewPepperHelper {
  public:
@@ -51,7 +51,7 @@ class CONTENT_EXPORT RenderViewPepperHelper {
   virtual ~RenderViewPepperHelper();
 
   virtual WebKit::WebPlugin* CreatePepperWebPlugin(
-      const webkit::WebPluginInfo& webplugin_info,
+      const WebPluginInfo& webplugin_info,
       const WebKit::WebPluginParams& params);
 
   // Called by RenderView to implement the corresponding function in its base
diff --git a/content/renderer/renderer_webkitplatformsupport_impl.cc b/content/renderer/renderer_webkitplatformsupport_impl.cc
index 320d7fe..e31e59e 100644
--- a/content/renderer/renderer_webkitplatformsupport_impl.cc
+++ b/content/renderer/renderer_webkitplatformsupport_impl.cc
@@ -27,6 +27,7 @@
 #include "content/common/mime_registry_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/webplugininfo.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/renderer/device_orientation/device_motion_event_pump.h"
 #include "content/renderer/dom_storage/webstoragenamespace_impl.h"
@@ -67,7 +68,6 @@
 #include "webkit/glue/simple_webmimeregistry_impl.h"
 #include "webkit/glue/webfileutilities_impl.h"
 #include "webkit/glue/webkit_glue.h"
-#include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_WIN)
 #include "content/common/child_process_messages.h"
@@ -908,20 +908,20 @@ void RendererWebKitPlatformSupportImpl::getPluginList(
     bool refresh,
     WebKit::WebPluginListBuilder* builder) {
 #if defined(ENABLE_PLUGINS)
-  std::vector<webkit::WebPluginInfo> plugins;
+  std::vector<WebPluginInfo> plugins;
   if (!plugin_refresh_allowed_)
     refresh = false;
   RenderThread::Get()->Send(
       new ViewHostMsg_GetPlugins(refresh, &plugins));
   for (size_t i = 0; i < plugins.size(); ++i) {
-    const webkit::WebPluginInfo& plugin = plugins[i];
+    const WebPluginInfo& plugin = plugins[i];
 
     builder->addPlugin(
         plugin.name, plugin.desc,
         plugin.path.BaseName().AsUTF16Unsafe());
 
     for (size_t j = 0; j < plugin.mime_types.size(); ++j) {
-      const webkit::WebPluginMimeType& mime_type = plugin.mime_types[j];
+      const WebPluginMimeType& mime_type = plugin.mime_types[j];
 
       builder->addMediaTypeToLastPlugin(
           WebString::fromUTF8(mime_type.mime_type), mime_type.description);
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index 39972ab..687f19e 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -1186,7 +1186,7 @@ bool WebPluginDelegateProxy::UseSynchronousGeometryUpdates() {
 
   // The move networks plugin needs to be informed of geometry updates
   // synchronously.
-  std::vector<webkit::WebPluginMimeType>::iterator index;
+  std::vector<WebPluginMimeType>::iterator index;
   for (index = info_.mime_types.begin(); index != info_.mime_types.end();
        index++) {
     if (index->mime_type == "application/x-vnd.moveplayer.qm" ||
diff --git a/content/renderer/webplugin_delegate_proxy.h b/content/renderer/webplugin_delegate_proxy.h
index bc6d721..c0838a2 100644
--- a/content/renderer/webplugin_delegate_proxy.h
+++ b/content/renderer/webplugin_delegate_proxy.h
@@ -13,6 +13,7 @@
 #include "base/memory/weak_ptr.h"
 #include "base/sequenced_task_runner_helpers.h"
 #include "content/child/npapi/webplugin_delegate.h"
+#include "content/public/common/webplugininfo.h"
 #include "ipc/ipc_listener.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_sender.h"
@@ -20,7 +21,6 @@
 #include "ui/gfx/rect.h"
 #include "ui/surface/transport_dib.h"
 #include "url/gurl.h"
-#include "webkit/plugins/webplugininfo.h"
 
 #if defined(OS_MACOSX)
 #include "base/containers/hash_tables.h"
@@ -259,7 +259,7 @@ class WebPluginDelegateProxy
   scoped_refptr<PluginChannelHost> channel_host_;
   std::string mime_type_;
   int instance_id_;
-  webkit::WebPluginInfo info_;
+  WebPluginInfo info_;
 
   gfx::Rect plugin_rect_;
   gfx::Rect clip_rect_;