Convert the PluginService interface to be an async wrapper around PluginList.

chrome/browser/extensions/extension_content_settings_api.h

Index: chrome/browser/extensions/extension_content_settings_api.h
diff --git a/chrome/browser/extensions/extension_content_settings_api.h b/chrome/browser/extensions/extension_content_settings_api.h
index 25aca13560efedbf05b6fb4ab530f0a45126d929..cc19f3046a95298aeb7656822c00e12b401b353c 100644
--- a/chrome/browser/extensions/extension_content_settings_api.h
+++ b/chrome/browser/extensions/extension_content_settings_api.h
@@ -7,14 +7,9 @@
 #pragma once
 
 #include "chrome/browser/extensions/extension_function.h"
+#include "webkit/plugins/npapi/plugin_group.h"

[jam, 2011/09/21 00:04:51]

nit: can you just forward declare instead?

 
-namespace webkit {
-namespace npapi {
-
-class PluginList;
-
-}
-}
+class PluginService;

[jam, 2011/09/21 00:04:51]

nit: doesn't look like this is needed

 
 class ClearContentSettingsFunction : public SyncExtensionFunction {
  public:
@@ -47,10 +42,7 @@ class GetResourceIdentifiersFunction : public AsyncExtensionFunction {
   FRIEND_TEST_ALL_PREFIXES(ExtensionApiTest,
                            ContentSettingsGetResourceIdentifiers);
 
-  void GetPluginsOnFileThread();
-
-  // Used to override the global plugin list in tests.
-  static void SetPluginListForTesting(webkit::npapi::PluginList* plugin_list);
+  void OnGotPluginGroups(std::vector<webkit::npapi::PluginGroup> groups);

[jam, 2011/09/21 00:04:51]

nit: const ref

 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_CONTENT_SETTINGS_API_H__