Changing PluginPrefs to use PluginFinder's async interface.

chrome/browser/ui/pdf/pdf_unsupported_feature.cc

 // 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.
 
 #include "chrome/browser/ui/pdf/pdf_unsupported_feature.h"
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/chrome_plugin_service_filter.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
+#include "chrome/browser/plugin_finder.h"
+#include "chrome/browser/plugin_installer.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_preferences_util.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/interstitial_page_delegate.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "webkit/plugins/npapi/plugin_group.h"
 
-#if defined(ENABLE_PLUGIN_INSTALLATION)
-#include "chrome/browser/plugin_finder.h"
-#include "chrome/browser/plugin_installer.h"
-#else
-// Forward-declare PluginFinder. It's never actually used, but we pass a NULL
-// pointer instead.
-class PluginFinder;
-#endif
-
 using content::InterstitialPage;
 using content::OpenURLParams;
 using content::PluginService;
 using content::Referrer;
 using content::UserMetricsAction;
 using content::WebContents;
 using webkit::npapi::PluginGroup;
 using webkit::WebPluginInfo;
 
 namespace {
@@ skipping 320 matching lines @@
   OpenUsingReader(tab_contents_, reader_webplugininfo_, NULL, NULL);
   return true;
 }
 
 void PDFUnsupportedFeatureInfoBarDelegate::OnNo() {
   content::RecordAction(reader_installed_ ?
                         UserMetricsAction("PDF_UseReaderInfoBarCancel") :
                         UserMetricsAction("PDF_InstallReaderInfoBarCancel"));
 }
 
-void GotPluginGroupsCallback(int process_id,
-                             int routing_id,
-                             PluginFinder* plugin_finder,
-                             const std::vector<PluginGroup>& groups) {
+void GotPluginsCallback(int process_id,
+                        int routing_id,
+                        PluginFinder* plugin_finder,
+                        const std::vector<webkit::WebPluginInfo>& plugins) {
   WebContents* web_contents =
       tab_util::GetWebContentsByID(process_id, routing_id);
   if (!web_contents)
     return;
 
   TabContents* tab = TabContents::FromWebContents(web_contents);
   if (!tab)
     return;
 
   string16 reader_group_name(ASCIIToUTF16(PluginGroup::kAdobeReaderGroupName));
   // If the Reader plugin is disabled by policy, don't prompt them.
   PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(tab->profile());
   if (plugin_prefs->PolicyStatusForPlugin(reader_group_name) ==
       PluginPrefs::POLICY_DISABLED) {
     return;
   }
 
   const webkit::WebPluginInfo* reader = NULL;
-  for (size_t i = 0; i < groups.size(); ++i) {
-    if (groups[i].GetGroupName() == reader_group_name) {
-      const std::vector<WebPluginInfo>& plugins =
-          groups[i].web_plugin_infos();
-      DCHECK_EQ(plugins.size(), 1u);
-      reader = &plugins[0];
-      break;
+  for (size_t i = 0; i < plugins.size(); ++i) {
+    PluginInstaller* installer = plugin_finder->GetPluginInstaller(plugins[i]);
+    if (reader_group_name == installer->name()) {
+      DCHECK(!reader);
+      reader = &plugins[i];
     }
   }
 
   tab->infobar_tab_helper()->AddInfoBar(
       new PDFUnsupportedFeatureInfoBarDelegate(tab, reader, plugin_finder));
 }
 
 void GotPluginFinderCallback(int process_id,
                              int routing_id,
                              PluginFinder* plugin_finder) {
-  PluginService::GetInstance()->GetPluginGroups(
-      base::Bind(&GotPluginGroupsCallback, process_id, routing_id,
-                                           base::Unretained(plugin_finder)));
+  PluginService::GetInstance()->GetPlugins(
+      base::Bind(&GotPluginsCallback, process_id, routing_id,
+                 base::Unretained(plugin_finder)));
 }
 
 }  // namespace
 
 void PDFHasUnsupportedFeature(TabContents* tab) {
 #if defined(OS_WIN) && defined(ENABLE_PLUGIN_INSTALLATION)
   // Only works for Windows for now.  For Mac, we'll have to launch the file
   // externally since Adobe Reader doesn't work inside Chrome.
   PluginFinder::Get(base::Bind(&GotPluginFinderCallback,
       tab->web_contents()->GetRenderProcessHost()->GetID(),
       tab->web_contents()->GetRenderViewHost()->GetRoutingID()));
 #endif
 }