Separate plugin_metadata from plugin_installer, thread-safe plugin_finder

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 0fd90b01a695200d1dda33b914c14fb0a3b125ff..411788158be32f9ed8308bf36ae15472d41bb0ce 100644
--- a/chrome/browser/plugin_prefs.h
+++ b/chrome/browser/plugin_prefs.h
@@ -119,7 +119,6 @@ class PluginPrefs : public RefcountedProfileKeyedService,
   void EnablePluginGroupInternal(
       bool enabled,
       const string16& group_name,
-      PluginFinder* plugin_finder,
       const std::vector<webkit::WebPluginInfo>& plugins);
   void EnablePluginInternal(
       bool enabled,
@@ -133,8 +132,7 @@ class PluginPrefs : public RefcountedProfileKeyedService,
   void GetPreferencesDataOnFileThread();
 
   // Called on the UI thread with the plugin data to save the preferences.
-  void OnUpdatePreferences(const std::vector<webkit::WebPluginInfo>& plugins,
-                           PluginFinder* finder);
+  void OnUpdatePreferences(const std::vector<webkit::WebPluginInfo>& plugins);
 
   // Sends the notification that plugin data has changed.
   void NotifyPluginStatusChanged();
@@ -146,23 +144,6 @@ class PluginPrefs : public RefcountedProfileKeyedService,
   static bool IsStringMatchedInSet(const string16& name,
                                    const std::set<string16>& pattern_set);
 
-  // Callback method called by 'EnablePlugin' method.
-  // It performs the logic to check if a plug-in can be enabled.
-  void EnablePluginIfPossibleCallback(
-      bool enabled, const FilePath& path,
-      const base::Callback<void(bool)>& canEnableCallback,
-      PluginFinder* finder);
-
-  // Callback method that takes in the asynchronously created
-  // plug-in finder instance. It is called by 'EnablePluginGroup'.
-  void GetPluginFinderForEnablePluginGroup(bool enabled,
-                                           const string16& group_name,
-                                           PluginFinder* finder);
-
-  // Callback method that takes in the asynchronously created plug-in finder
-  // instance. It is called by 'GetPreferencesDataOnFileThread'.
-  void GetPluginFinderForGetPreferencesDataOnFileThread(PluginFinder* finder);
-
   // Guards access to the following data structures.
   mutable base::Lock lock_;