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..01c5b69db7529cfc730939ab0e3f12f7131f5b27 100644
--- a/content/browser/plugin_service.cc
+++ b/content/browser/plugin_service.cc
@@ -644,7 +644,7 @@ void PluginService::UnregisterInternalPlugin(const FilePath& path) {
 }
 
 webkit::npapi::PluginList* PluginService::plugin_list() {
-  return webkit::npapi::PluginList::Singleton();
+  return plugin_list_;

[jam, 2011/11/10 23:57:40]

nit: please move this function impl to the header since it's just a simple
getter now :)

[Robert Sesek, 2011/11/11 01:19:19]

Will do this in a follow-up tomorrow. Afk and want to cq.

[Robert Sesek, 2011/11/11 16:01:18]

Done.

 }
 
 void PluginService::SetPluginListForTesting(