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

chrome/browser/component_updater/pepper_flash_component_installer.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/component_updater/flash_component_installer.h"
 
 #include <string.h>
 
 #include "base/base_paths.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "base/values.h"
 #include "chrome/browser/component_updater/component_updater_service.h"
 #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 "ppapi/c/private/ppb_pdf.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/plugin_constants.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
+#include "webkit/plugins/ppapi/ppapi_plugin_info.h"
 
 namespace {
 
 // CRX hash. The extension id is: mimojjlkmoijpicakmndhoigimigcmbb.
 const uint8 sha2_hash[] = {0xc8, 0xce, 0x99, 0xba, 0xce, 0x89, 0xf8, 0x20,
                            0xac, 0xd3, 0x7e, 0x86, 0x8c, 0x86, 0x2c, 0x11,
                            0xb9, 0x40, 0xc5, 0x55, 0xaf, 0x08, 0x63, 0x70,
                            0x54, 0xf9, 0x56, 0xd3, 0xe7, 0x88, 0xba, 0x8c};
 
 // File name of the Pepper Flash plugin on different platforms.
@@ skipping 64 matching lines @@
   // It might be that flapper is using as a temporary hack the PDF interface
   // so we need to check for that as well. TODO(cpu): make this more sane.
   return (strcmp(interface_name, PPB_PDF_INTERFACE) == 0);
 }
 
 }  // namespace
 
 bool MakePepperFlashPluginInfo(const FilePath& flash_path,
                                const Version& flash_version,
                                bool out_of_process,
-                               PepperPluginInfo* plugin_info) {
+                               webkit::ppapi::PluginInfo* plugin_info) {
   if (!flash_version.IsValid())
     return false;
   const std::vector<uint16> ver_nums = flash_version.components();
   if (ver_nums.size() < 3)
     return false;
 
   plugin_info->is_internal = false;
   plugin_info->is_out_of_process = out_of_process;
   plugin_info->path = flash_path;
   plugin_info->name = kFlashPluginName;
@@ skipping 11 matching lines @@
   webkit::WebPluginMimeType spl_mime_type(kFlashPluginSplMimeType,
                                           kFlashPluginSplExtension,
                                           kFlashPluginName);
   plugin_info->mime_types.push_back(spl_mime_type);
   return true;
 }
 
 void RegisterPepperFlashWithChrome(const FilePath& path,
                                    const Version& version) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  PepperPluginInfo plugin_info;
+  webkit::ppapi::PluginInfo plugin_info;
   // Register it as out-of-process and disabled.
   if (!MakePepperFlashPluginInfo(path, version, true, &plugin_info))
     return;
   PluginPrefs::EnablePluginGlobally(false, plugin_info.path);
+  webkit::WebPluginInfo webplugin_info;
+  webkit::ppapi::PepperToWebPluginInfo(plugin_info, &webplugin_info);
   webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(
-      plugin_info.ToWebPluginInfo());
+      webplugin_info);
   webkit::npapi::PluginList::Singleton()->RefreshPlugins();
 }
 
 class PepperFlashComponentInstaller : public ComponentInstaller {
  public:
   explicit PepperFlashComponentInstaller(const Version& version);
 
   virtual ~PepperFlashComponentInstaller() {}
 
   virtual void OnUpdateError(int error) OVERRIDE;
@@ skipping 101 matching lines @@
       NewRunnableFunction(&FinishPepperFlashUpdateRegistration, cus, version));
 }
 
 void RegisterPepperFlashComponent(ComponentUpdateService* cus) {
 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
   // TODO(cpu): support Mac and Linux flash pepper.
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       NewRunnableFunction(&StartPepperFlashUpdateRegistration, cus));
 #endif
 }