Move PluginPrefs to use PluginService instead of PluginList.

content/browser/plugin_service.cc

Index: content/browser/plugin_service.cc
diff --git a/content/browser/plugin_service.cc b/content/browser/plugin_service.cc
index b0cbb7f8541d197993ecd71711b38af3b7b4d640..42ba86872fa12dbf47943697c687c03f731c7d94 100644
--- a/content/browser/plugin_service.cc
+++ b/content/browser/plugin_service.cc
@@ -644,6 +644,8 @@ void PluginService::UnregisterInternalPlugin(const FilePath& path) {
 }
 
 webkit::npapi::PluginList* PluginService::plugin_list() {
+  if (plugin_list_)

[jam, 2011/11/10 23:39:16]

this seems to be covering up for Init() not being called. We this function
should just return plugin_list_, and require callers to call Init() always.

[Robert Sesek, 2011/11/10 23:42:06]

Done.

+    return plugin_list_;
   return webkit::npapi::PluginList::Singleton();
 }