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

chrome/browser/pdf_unsupported_feature.cc

 // Copyright (c) 2011 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/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/chrome_plugin_service_filter.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/chrome_interstitial_page.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/pref_names.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/user_metrics.h"
 #include "content/common/view_messages.h"
 #include "grit/browser_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources_standard.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "webkit/plugins/npapi/plugin_group.h"
-#include "webkit/plugins/npapi/plugin_list.h"
-#include "webkit/plugins/webplugininfo.h"
 
 using webkit::npapi::PluginGroup;
-using webkit::npapi::PluginList;
 using webkit::WebPluginInfo;
 
 namespace {
 
 // Only launch Adobe Reader X or later.
 static const uint16 kMinReaderVersionToUse = 10;
 
 static const char kReaderUpdateUrl[] =
     "http://www.adobe.com/go/getreader_chrome";
 
@@ skipping 181 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(PDFUnsupportedFeatureInterstitial);
 };
 
 // The info bar delegate used to inform the user that we don't support a feature
 // in the PDF.  See the comment about how we swap buttons for
 // PDFEnableAdobeReaderInfoBarDelegate.
 class PDFUnsupportedFeatureInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   // |reader_group| is NULL if Adobe Reader isn't installed.
   PDFUnsupportedFeatureInfoBarDelegate(TabContentsWrapper* tab_contents,
-                                       PluginGroup* reader_group);
+                                       const PluginGroup* reader_group);
   virtual ~PDFUnsupportedFeatureInfoBarDelegate();
 
   // ConfirmInfoBarDelegate
   virtual void InfoBarDismissed() OVERRIDE;
   virtual gfx::Image* GetIcon() const OVERRIDE;
   virtual Type GetInfoBarType() const OVERRIDE;
   virtual bool Accept() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
   virtual string16 GetMessageText() const OVERRIDE;
 
  private:
   bool OnYes();
   void OnNo();
 
   TabContentsWrapper* tab_contents_;
   bool reader_installed_;
   bool reader_vulnerable_;
   WebPluginInfo reader_webplugininfo_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(PDFUnsupportedFeatureInfoBarDelegate);
 };
 
 PDFUnsupportedFeatureInfoBarDelegate::PDFUnsupportedFeatureInfoBarDelegate(
     TabContentsWrapper* tab_contents,
-    PluginGroup* reader_group)
+    const PluginGroup* reader_group)
     : ConfirmInfoBarDelegate(tab_contents->tab_contents()),
       tab_contents_(tab_contents),
       reader_installed_(!!reader_group),
       reader_vulnerable_(false) {
   if (!reader_installed_) {
     UserMetrics::RecordAction(
         UserMetricsAction("PDF_InstallReaderInfoBarShown"));
     return;
   }
 
@@ skipping 79 matching lines @@
   OpenUsingReader(tab_contents_, reader_webplugininfo_, NULL, NULL);
   return true;
 }
 
 void PDFUnsupportedFeatureInfoBarDelegate::OnNo() {
   UserMetrics::RecordAction(reader_installed_ ?
       UserMetricsAction("PDF_UseReaderInfoBarCancel") :
       UserMetricsAction("PDF_InstallReaderInfoBarCancel"));
 }
 
-}  // namespace
-
-void PDFHasUnsupportedFeature(TabContentsWrapper* tab) {
-#if !defined(OS_WIN)
-  // Only works for Windows for now.  For Mac, we'll have to launch the file
-  // externally since Adobe Reader doesn't work inside Chrome.
-  return;
-#endif
+void GotPluginGroupsCallback(TabContentsWrapper* tab,
+                             const std::vector<PluginGroup>& groups) {
   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;
   }
 
-  PluginGroup* reader_group = NULL;
-  std::vector<PluginGroup> plugin_groups;
-  PluginList::Singleton()->GetPluginGroups(false, &plugin_groups);
-  for (size_t i = 0; i < plugin_groups.size(); ++i) {
-    if (plugin_groups[i].GetGroupName() == reader_group_name) {
-      reader_group = &plugin_groups[i];
+  const PluginGroup* reader_group = NULL;
+  for (size_t i = 0; i < groups.size(); ++i) {
+    if (groups[i].GetGroupName() == reader_group_name) {
+      reader_group = &groups[i];
       break;
     }
   }
 
   tab->infobar_tab_helper()->AddInfoBar(
       new PDFUnsupportedFeatureInfoBarDelegate(tab, reader_group));
 }
+
+}  // namespace
+
+void PDFHasUnsupportedFeature(TabContentsWrapper* tab) {
+#if !defined(OS_WIN)
+  // Only works for Windows for now.  For Mac, we'll have to launch the file
+  // externally since Adobe Reader doesn't work inside Chrome.
+  return;
+#endif
+
+  PluginService::GetInstance()->GetPluginGroups(
+      base::Bind(&GotPluginGroupsCallback, tab));

[jam, 2011/09/22 21:10:59]

the TabContentsWrapper might not be around when the callback is called. so
you'll want to send the tab->render_view_host()->process()->id() and
tab->render_view_host()->routing_id(). then in the callback you can use
tab_util::GetTabContentsByID() to get the TC, and from there use
TabContentsWrapper::GetCurrentWrapperForContents

[Robert Sesek, 2011/09/22 23:26:51]

Done. Thanks for the detailed how-to :-).

+}