Move PluginPrefs to use PluginService instead of PluginList.

chrome/browser/plugin_prefs.h

Index: chrome/browser/plugin_prefs.h
diff --git a/chrome/browser/plugin_prefs.h b/chrome/browser/plugin_prefs.h
index e6afa451b772b57d5ba41023367593cf4507efeb..3792dfdf5690cf590d4d9ba81099fe1de9018098 100644
--- a/chrome/browser/plugin_prefs.h
+++ b/chrome/browser/plugin_prefs.h
@@ -117,8 +117,15 @@ class PluginPrefs : public base::RefCountedThreadSafe<PluginPrefs>,
   // Returns the plugin list to use, either the singleton or the override.
   webkit::npapi::PluginList* GetPluginList();
 
-  // Called on the file thread to update the plug-in state.
-  void EnablePluginInternal(bool enabled, const FilePath& path);
+  // Callback for after the plugin groups have been loaded.
+  void EnablePluginGroupInternal(
+      bool enabled,
+      const string16& group_name,
+      const std::vector<webkit::npapi::PluginGroup>& groups);
+  void EnablePluginInternal(
+      bool enabled,
+      const FilePath& path,
+      const std::vector<webkit::npapi::PluginGroup>& groups);
 
   // Called on the file thread to get the data necessary to update the saved
   // preferences.