Move PepperPluginInfo to content/public/common and put it into the content namespace.

BUG=98716
Review URL: http://codereview.chromium.org/8366027

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

4 files changed, 14 insertions, 14 deletions

diff --git a/chrome/browser/component_updater/pepper_flash_component_installer.cc b/chrome/browser/component_updater/pepper_flash_component_installer.cc
index e100ede8..83e088f 100644
--- a/chrome/browser/component_updater/pepper_flash_component_installer.cc
+++ b/chrome/browser/component_updater/pepper_flash_component_installer.cc
@@ -21,7 +21,7 @@
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/common/chrome_paths.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/pepper_plugin_registry.h"
+#include "content/public/common/pepper_plugin_info.h"
 #include "ppapi/c/private/ppb_pdf.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/plugin_constants.h"
@@ -121,7 +121,7 @@ bool SupportsPepperInterface(const char* interface_name) {
 bool MakePepperFlashPluginInfo(const FilePath& flash_path,
                                const Version& flash_version,
                                bool out_of_process,
-                               PepperPluginInfo* plugin_info) {
+                               content::PepperPluginInfo* plugin_info) {
   if (!flash_version.IsValid())
     return false;
   const std::vector<uint16> ver_nums = flash_version.components();
@@ -153,7 +153,7 @@ bool MakePepperFlashPluginInfo(const FilePath& flash_path,
 void RegisterPepperFlashWithChrome(const FilePath& path,
                                    const Version& version) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  PepperPluginInfo plugin_info;
+  content::PepperPluginInfo plugin_info;
   // Register it as out-of-process and disabled.
   if (!MakePepperFlashPluginInfo(path, version, true, &plugin_info))
     return;
diff --git a/chrome/browser/extensions/extension_service.cc b/chrome/browser/extensions/extension_service.cc
index e23bba9..f646e2e 100644
--- a/chrome/browser/extensions/extension_service.cc
+++ b/chrome/browser/extensions/extension_service.cc
@@ -2968,8 +2968,8 @@ void ExtensionService::UpdatePluginListWithNaClModules() {
   // there is a MIME type that module wants to handle, so we need to add that
   // MIME type to plugins which handle NaCl modules in order to allow the
   // individual modules to handle these types.
-  const PepperPluginInfo* pepper_info = NULL;
-  std::vector<PepperPluginInfo> plugins;
+  const content::PepperPluginInfo* pepper_info = NULL;
+  std::vector<content::PepperPluginInfo> plugins;
   PepperPluginRegistry::ComputeList(&plugins);
 
   // Search the entire plugin list for plugins that handle the NaCl MIME type.
diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc
index 877f9be..b45dc15 100644
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -18,7 +18,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/render_messages.h"
-#include "content/common/pepper_plugin_registry.h"
+#include "content/public/common/pepper_plugin_info.h"
 #include "remoting/client/plugin/pepper_entrypoints.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -62,7 +62,7 @@ const char kRemotingViewerPluginOldMimeType[] =
 // and some are extra shared libraries distributed with the browser (these are
 // not marked internal, aside from being automatically registered, they're just
 // regular plugins).
-void ComputeBuiltInPlugins(std::vector<PepperPluginInfo>* plugins) {
+void ComputeBuiltInPlugins(std::vector<content::PepperPluginInfo>* plugins) {
   // PDF.
   //
   // Once we're sandboxed, we can't know if the PDF plugin is available or not;
@@ -73,7 +73,7 @@ void ComputeBuiltInPlugins(std::vector<PepperPluginInfo>* plugins) {
   FilePath path;
   if (PathService::Get(chrome::FILE_PDF_PLUGIN, &path)) {
     if (skip_pdf_file_check || file_util::PathExists(path)) {
-      PepperPluginInfo pdf;
+      content::PepperPluginInfo pdf;
       pdf.path = path;
       pdf.name = kPDFPluginName;
       webkit::WebPluginMimeType pdf_mime_type(kPDFPluginMimeType,
@@ -98,7 +98,7 @@ void ComputeBuiltInPlugins(std::vector<PepperPluginInfo>* plugins) {
   static bool skip_nacl_file_check = false;
   if (PathService::Get(chrome::FILE_NACL_PLUGIN, &path)) {
     if (skip_nacl_file_check || file_util::PathExists(path)) {
-      PepperPluginInfo nacl;
+      content::PepperPluginInfo nacl;
       nacl.path = path;
       nacl.name = kNaClPluginName;
       webkit::WebPluginMimeType nacl_mime_type(kNaClPluginMimeType,
@@ -113,7 +113,7 @@ void ComputeBuiltInPlugins(std::vector<PepperPluginInfo>* plugins) {
 
   // The Remoting Viewer plugin is built-in.
 #if defined(ENABLE_REMOTING)
-  PepperPluginInfo info;
+  content::PepperPluginInfo info;
   info.is_internal = true;
   info.name = kRemotingViewerPluginName;
   info.path = FilePath(kRemotingViewerPluginPath);
@@ -136,7 +136,7 @@ void ComputeBuiltInPlugins(std::vector<PepperPluginInfo>* plugins) {
 #endif
 }
 
-void AddOutOfProcessFlash(std::vector<PepperPluginInfo>* plugins) {
+void AddOutOfProcessFlash(std::vector<content::PepperPluginInfo>* plugins) {
   // Flash being out of process is handled separately than general plugins
   // for testing purposes.
   bool flash_out_of_process = !CommandLine::ForCurrentProcess()->HasSwitch(
@@ -149,7 +149,7 @@ void AddOutOfProcessFlash(std::vector<PepperPluginInfo>* plugins) {
   if (flash_path.empty())
     return;
 
-  PepperPluginInfo plugin;
+  content::PepperPluginInfo plugin;
   plugin.is_out_of_process = flash_out_of_process;
   plugin.path = FilePath(flash_path);
   plugin.name = kFlashPluginName;
@@ -268,7 +268,7 @@ void ChromeContentClient::SetGpuInfo(const content::GPUInfo& gpu_info) {
 }
 
 void ChromeContentClient::AddPepperPlugins(
-    std::vector<PepperPluginInfo>* plugins) {
+    std::vector<content::PepperPluginInfo>* plugins) {
   ComputeBuiltInPlugins(plugins);
   AddOutOfProcessFlash(plugins);
 }
diff --git a/chrome/common/chrome_content_client.h b/chrome/common/chrome_content_client.h
index e7b383f..5d82037 100644
--- a/chrome/common/chrome_content_client.h
+++ b/chrome/common/chrome_content_client.h
@@ -20,7 +20,7 @@ class ChromeContentClient : public content::ContentClient {
   virtual void SetActiveURL(const GURL& url) OVERRIDE;
   virtual void SetGpuInfo(const content::GPUInfo& gpu_info) OVERRIDE;
   virtual void AddPepperPlugins(
-      std::vector<PepperPluginInfo>* plugins) OVERRIDE;
+      std::vector<content::PepperPluginInfo>* plugins) OVERRIDE;
   virtual bool CanSendWhileSwappedOut(const IPC::Message* msg) OVERRIDE;
   virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg) OVERRIDE;
   virtual std::string GetUserAgent(bool* overriding) const OVERRIDE;