[4] Changing content_settings_api to use PluginFinder's async interface

chrome/browser/extensions/api/content_settings/content_settings_api.h

Index: chrome/browser/extensions/api/content_settings/content_settings_api.h
diff --git a/chrome/browser/extensions/api/content_settings/content_settings_api.h b/chrome/browser/extensions/api/content_settings/content_settings_api.h
index ecba4951a949453a274908d27ac112dd7b0bd83d..77218a1f2dcf32bbc8a9663d2d97901a5a06d37a 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_api.h
+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_EXTENSIONS_API_CONTENT_SETTINGS_CONTENT_SETTINGS_API_H__
 
 #include "chrome/browser/extensions/extension_function.h"
+#include "chrome/browser/plugin_finder.h"
 
 namespace webkit {
 namespace npapi {
@@ -62,11 +63,16 @@ class GetResourceIdentifiersFunction : public AsyncExtensionFunction {
   FRIEND_TEST_ALL_PREFIXES(ExtensionApiTest,
                            ContentSettingsGetResourceIdentifiers);
 
-  void OnGotPluginGroups(const std::vector<webkit::npapi::PluginGroup>& groups);
+  void OnGotPlugins(PluginFinder* finder,

[Mattias Nissler (ping if slow), 2012/08/27 15:42:09]

This could also use some documentation on when and from where it gets called.

[ibraaaa, 2012/08/27 17:34:05]

Done.

+                    const std::vector<webkit::WebPluginInfo>& plugins);
+
+  // Callback method called by RunImpl. It takes in the asynchronously created
+  // PluginFinder instance. It delegates the logic (async) to OnGotPlugins.
+  void GetPluginFinderForRunImpl(PluginFinder* finder);
 
   // Used to override the global plugin list in tests.
-  static void SetPluginGroupsForTesting(
-      const std::vector<webkit::npapi::PluginGroup>* plugin_groups);
+  static void SetPluginsForTesting(
+      const std::vector<webkit::WebPluginInfo>* plugins);
 };
 
 }  // namespace extensions