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

webkit/plugins/npapi/plugin_list.h

Index: webkit/plugins/npapi/plugin_list.h
diff --git a/webkit/plugins/npapi/plugin_list.h b/webkit/plugins/npapi/plugin_list.h
index 640ccbddc4a338024290cae5232b6fc8cf63f8b7..a7bb526b14a16b8938e9a7e766f7fc8fdb035258 100644
--- a/webkit/plugins/npapi/plugin_list.h
+++ b/webkit/plugins/npapi/plugin_list.h
@@ -36,7 +36,9 @@ extern FilePath::CharType kDefaultPluginLibraryName[];
 class PluginInstance;
 
 // This struct holds entry points into a plugin.  The entry points are
-// slightly different between Win/Mac and Unixes.
+// slightly different between Win/Mac and Unixes.  Note that the interface for
+// querying plugins is synchronous and it is preferable to use a higher-level
+// asynchronous information to query information.
 struct PluginEntryPoints {
 #if !defined(OS_POSIX) || defined(OS_MACOSX)
   NP_GetEntryPointsFunc np_getentrypoints;
@@ -118,9 +120,13 @@ class PluginList {
       const string16& mime_type_descriptions,
       std::vector<webkit::WebPluginMimeType>* parsed_mime_types);
 
-  // Get all the plugins.
+  // Get all the plugins synchronously, reloading the list if necessary.
   void GetPlugins(std::vector<webkit::WebPluginInfo>* plugins);
 
+  // Gets the list of cached plugins without loading them, even if
+  // RefreshPlugins() was called.
+  void GetCachedPlugins(std::vector<webkit::WebPluginInfo>* plugins);
+
   // Returns a list in |info| containing plugins that are found for
   // the given url and mime type (including disabled plugins, for
   // which |info->enabled| is false).  The mime type which corresponds
@@ -146,7 +152,9 @@ class PluginList {
   bool GetPluginInfoByPath(const FilePath& plugin_path,
                            webkit::WebPluginInfo* info);
 
-  // Populates the given vector with all available plugin groups.
+  // Populates the given vector with all available plugin groups. If
+  // |load_if_necessary| is true, this will potentially load the plugin list
+  // synchronously.
   void GetPluginGroups(bool load_if_necessary,
                        std::vector<PluginGroup>* plugin_groups);