Split ppapi::PluginList from PepperPluginRegistry so that DRT could load pepper plugins.

chrome/common/chrome_content_client.cc

Index: chrome/common/chrome_content_client.cc
===================================================================
--- chrome/common/chrome_content_client.cc	(revision 101488)
+++ chrome/common/chrome_content_client.cc	(working copy)
@@ -18,12 +18,12 @@
 #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 "remoting/client/plugin/pepper_entrypoints.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "webkit/glue/user_agent.h"
 #include "webkit/plugins/plugin_constants.h"
+#include "webkit/plugins/ppapi/ppapi_plugin_info.h"
 
 #if defined(OS_WIN)
 #include "content/common/sandbox_policy.h"
@@ -63,7 +63,7 @@
 // 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<webkit::ppapi::PluginInfo>* plugins) {
   // PDF.
   //
   // Once we're sandboxed, we can't know if the PDF plugin is available or not;
@@ -74,7 +74,7 @@
   FilePath path;
   if (PathService::Get(chrome::FILE_PDF_PLUGIN, &path)) {
     if (skip_pdf_file_check || file_util::PathExists(path)) {
-      PepperPluginInfo pdf;
+      webkit::ppapi::PluginInfo pdf;
       pdf.path = path;
       pdf.name = kPDFPluginName;
       webkit::WebPluginMimeType pdf_mime_type(kPDFPluginMimeType,
@@ -99,7 +99,7 @@
   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;
+      webkit::ppapi::PluginInfo nacl;
       nacl.path = path;
       nacl.name = kNaClPluginName;
       webkit::WebPluginMimeType nacl_mime_type(kNaClPluginMimeType,
@@ -114,7 +114,7 @@
 
   // The Remoting Viewer plugin is built-in.
 #if defined(ENABLE_REMOTING)
-  PepperPluginInfo info;
+  webkit::ppapi::PluginInfo info;
   info.is_internal = true;
   info.name = kRemotingViewerPluginName;
   info.path = FilePath(kRemotingViewerPluginPath);
@@ -137,7 +137,7 @@
 #endif
 }
 
-void AddOutOfProcessFlash(std::vector<PepperPluginInfo>* plugins) {
+void AddOutOfProcessFlash(std::vector<webkit::ppapi::PluginInfo>* plugins) {
   // Flash being out of process is handled separately than general plugins
   // for testing purposes.
   bool flash_out_of_process = !CommandLine::ForCurrentProcess()->HasSwitch(
@@ -150,7 +150,7 @@
   if (flash_path.empty())
     return;
 
-  PepperPluginInfo plugin;
+  webkit::ppapi::PluginInfo plugin;
   plugin.is_out_of_process = flash_out_of_process;
   plugin.path = FilePath(flash_path);
   plugin.name = kFlashPluginName;
@@ -269,7 +269,7 @@
 }
 
 void ChromeContentClient::AddPepperPlugins(
-    std::vector<PepperPluginInfo>* plugins) {
+    std::vector<webkit::ppapi::PluginInfo>* plugins) {
   ComputeBuiltInPlugins(plugins);
   AddOutOfProcessFlash(plugins);
 }