Separate plugin_metadata from plugin_installer, thread-safe plugin_finder

chrome/browser/plugins/plugin_prefs.h

Index: chrome/browser/plugins/plugin_prefs.h
diff --git a/chrome/browser/plugins/plugin_prefs.h b/chrome/browser/plugins/plugin_prefs.h
index 14fef59556675653e69035bd60c8d8ae2242b4f7..dd27231b09e66f43a7e472a323d1b136dd453630 100644
--- a/chrome/browser/plugins/plugin_prefs.h
+++ b/chrome/browser/plugins/plugin_prefs.h
@@ -132,7 +132,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,
@@ -146,8 +145,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();
@@ -159,23 +157,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_;