[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..b58f66f844108b4dde54fd5fb1ca70fbb4eb574b 100644
--- a/chrome/browser/extensions/api/content_settings/content_settings_api.h
+++ b/chrome/browser/extensions/api/content_settings/content_settings_api.h
@@ -7,7 +7,10 @@
 
 #include "chrome/browser/extensions/extension_function.h"
 
+class PluginFinder;
+
 namespace webkit {
+struct WebPluginInfo;
 namespace npapi {
 class PluginGroup;
 }
@@ -62,11 +65,14 @@ class GetResourceIdentifiersFunction : public AsyncExtensionFunction {
   FRIEND_TEST_ALL_PREFIXES(ExtensionApiTest,
                            ContentSettingsGetResourceIdentifiers);
 
-  void OnGotPluginGroups(const std::vector<webkit::npapi::PluginGroup>& groups);
+  // Callback method that gets executed when both |finder| and |plugins|
+  // are asynchronously fetched.
+  void OnGotPlugins(const std::vector<webkit::WebPluginInfo>& plugins,
+                    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