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

content/browser/plugin_service.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 "content/browser/plugin_service.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/path_service.h"
@@ skipping 222 matching lines @@
 PpapiPluginProcessHost* PluginService::FindOrStartPpapiPluginProcess(
     const FilePath& plugin_path,
     PpapiPluginProcessHost::Client* client) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   PpapiPluginProcessHost* plugin_host = FindPpapiPluginProcess(plugin_path);
   if (plugin_host)
     return plugin_host;
 
   // Validate that the plugin is actually registered.
-  PepperPluginInfo* info = GetRegisteredPpapiPluginInfo(plugin_path);
+  const webkit::ppapi::PluginInfo* info =
+      GetRegisteredPpapiPluginInfo(plugin_path);
   if (!info)
     return NULL;
 
   // This plugin isn't loaded by any plugin process, so create a new process.
   scoped_ptr<PpapiPluginProcessHost> new_host(new PpapiPluginProcessHost(
       client->GetResourceContext()->host_resolver()));
   if (!new_host->Init(*info)) {
     NOTREACHED();  // Init is not expected to fail.
     return NULL;
   }
   return new_host.release();
 }
 
 PpapiBrokerProcessHost* PluginService::FindOrStartPpapiBrokerProcess(
     const FilePath& plugin_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   PpapiBrokerProcessHost* plugin_host = FindPpapiBrokerProcess(plugin_path);
   if (plugin_host)
     return plugin_host;
 
   // Validate that the plugin is actually registered.
-  PepperPluginInfo* info = GetRegisteredPpapiPluginInfo(plugin_path);
+  const webkit::ppapi::PluginInfo* info =
+      GetRegisteredPpapiPluginInfo(plugin_path);
   if (!info)
     return NULL;
 
   // TODO(ddorwin): Uncomment once out of process is supported.
   // DCHECK(info->is_out_of_process);
 
   // This broker isn't loaded by any broker process, so create a new process.
   scoped_ptr<PpapiBrokerProcessHost> new_host(
       new PpapiBrokerProcessHost);
   if (!new_host->Init(*info)) {
@@ skipping 196 matching lines @@
 }
 
 void PluginService::PurgePluginListCache(bool reload_pages) {
   for (RenderProcessHost::iterator it = RenderProcessHost::AllHostsIterator();
        !it.IsAtEnd(); it.Advance()) {
     it.GetCurrentValue()->Send(new ViewMsg_PurgePluginListCache(reload_pages));
   }
 }
 
 void PluginService::RegisterPepperPlugins() {
-  // TODO(abarth): It seems like the PepperPluginRegistry should do this work.
   PepperPluginRegistry::ComputeList(&ppapi_plugins_);
+  ppapi_plugins_.RegisterAll();
+  /*webkit::ppapi::PluginRegistry::ComputeList(&ppapi_plugins_);
   for (size_t i = 0; i < ppapi_plugins_.size(); ++i) {
     webkit::npapi::PluginList::Singleton()->RegisterInternalPlugin(
         ppapi_plugins_[i].ToWebPluginInfo());
-  }
+  }*/
 }
 
 // There should generally be very few plugins so a brute-force search is fine.
-PepperPluginInfo* PluginService::GetRegisteredPpapiPluginInfo(
+const webkit::ppapi::PluginInfo* PluginService::GetRegisteredPpapiPluginInfo(
     const FilePath& plugin_path) {
-  PepperPluginInfo* info = NULL;
-  for (size_t i = 0; i < ppapi_plugins_.size(); i++) {
-    if (ppapi_plugins_[i].path == plugin_path) {
-      info = &ppapi_plugins_[i];
-      break;
-    }
-  }
-  if (info)
-    return info;
-  // We did not find the plugin in our list. But wait! the plugin can also
-  // be a latecomer, as it happens with pepper flash. This information
-  // can be obtained from the PluginList singleton and we can use it to
-  // construct it and add it to the list. This same deal needs to be done
-  // in the renderer side in PepperPluginRegistry.
-  webkit::WebPluginInfo webplugin_info;
-  if (!webkit::npapi::PluginList::Singleton()->GetPluginInfoByPath(
-      plugin_path, &webplugin_info))
-    return NULL;
-  PepperPluginInfo new_pepper_info;
-  if (!MakePepperPluginInfo(webplugin_info, &new_pepper_info))
-    return NULL;
-  ppapi_plugins_.push_back(new_pepper_info);
-  return &ppapi_plugins_[ppapi_plugins_.size() - 1];
+  return ppapi_plugins_.GetInfoForPlugin(plugin_path);
 }
 
 #if defined(OS_POSIX) && !defined(OS_MACOSX)
 // static
 void PluginService::RegisterFilePathWatcher(
     FilePathWatcher *watcher,
     const FilePath& path,
     FilePathWatcher::Delegate* delegate) {
   bool result = watcher->Watch(path, delegate);
   DCHECK(result);
 }
 #endif