Separate plugin_metadata from plugin_installer, thread-safe plugin_finder

chrome/browser/plugins/plugin_prefs.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_PLUGINS_PLUGIN_PREFS_H_
 #define CHROME_BROWSER_PLUGINS_PLUGIN_PREFS_H_
 
 #include <map>
 #include <set>
 #include <vector>
@@ skipping 114 matching lines @@
       const std::set<string16>& disabled_exception_patterns,
       const std::set<string16>& enabled_patterns);
 
   // Returns the plugin list to use, either the singleton or the override.
   webkit::npapi::PluginList* GetPluginList() const;
 
   // Callback for after the plugin groups have been loaded.
   void EnablePluginGroupInternal(
       bool enabled,
       const string16& group_name,
-      PluginFinder* plugin_finder,
       const std::vector<webkit::WebPluginInfo>& plugins);
   void EnablePluginInternal(
       bool enabled,
       const FilePath& path,
       PluginFinder* plugin_finder,
       const base::Callback<void(bool)>& callback,
       const std::vector<webkit::WebPluginInfo>& plugins);
 
   // Called on the file thread to get the data necessary to update the saved
   // preferences.
   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();
 
   static void ListValueToStringSet(const base::ListValue* src,
                                    std::set<string16>* dest);
 
   // Checks if |name| matches any of the patterns in |pattern_set|.
   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_;
 
   PluginState plugin_state_;
   std::map<string16, bool> plugin_group_state_;
 
   std::set<string16> policy_disabled_plugin_patterns_;
   std::set<string16> policy_disabled_plugin_exception_patterns_;
   std::set<string16> policy_enabled_plugin_patterns_;
 
   // Weak pointer, owns us. Only used as a notification source.
   Profile* profile_;
 
   // Weak pointer, owned by the profile.
   PrefService* prefs_;
 
   // PluginList to use for testing. If this is NULL, defaults to the global
   // singleton.
   webkit::npapi::PluginList* plugin_list_;
 
   PrefChangeRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginPrefs);
 };
 
 #endif  // CHROME_BROWSER_PLUGINS_PLUGIN_PREFS_H_