Store plug-in enabled/disabled state in PluginPrefs instead of WebPluginInfo.

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/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/plugin_prefs.h"
 #include "chrome/browser/chrome_plugin_service_filter.h"

[Joao da Silva, 2011/09/13 09:30:48]

Nit: this line is out of place, please fix

[Bernhard Bauer, 2011/09/13 12:13:01]

Done.

 #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"
@@ skipping 86 matching lines @@
       IDS_PDF_INFOBAR_NEVER_USE_READER_BUTTON :
       IDS_PDF_INFOBAR_ALWAYS_USE_READER_BUTTON);
 }
 
 string16 PDFEnableAdobeReaderInfoBarDelegate::GetMessageText() const {
   return l10n_util::GetStringUTF16(IDS_PDF_INFOBAR_QUESTION_ALWAYS_USE_READER);
 }
 
 void PDFEnableAdobeReaderInfoBarDelegate::OnYes() {
   UserMetrics::RecordAction(UserMetricsAction("PDF_EnableReaderInfoBarOK"));
-  webkit::npapi::PluginList::Singleton()->EnableGroup(false,
-      ASCIIToUTF16(chrome::ChromeContentClient::kPDFPluginName));
   Profile* profile =
       Profile::FromBrowserContext(tab_contents_->browser_context());
   PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(profile);
   plugin_prefs->EnablePluginGroup(

[jam, 2011/09/13 01:47:31]

wouldn't these two calls assert since they're not being made on the file thread?

[Bernhard Bauer, 2011/09/13 12:13:01]

Indeed! Thanks for catching that. I changed PluginPrefs::EnablePluginGroup to
re-post itself on the right thread.

[jam, 2011/09/13 15:58:13]

cool. i was just going to comment that it would be nice if PluginPrefs, as much
as possible, has its methods called on the UI threads (or any thread).
internally it can post to different threads. this makes it much easier for the
callers.

       true, ASCIIToUTF16(webkit::npapi::PluginGroup::kAdobeReaderGroupName));
-  plugin_prefs->UpdatePreferences(0);
+  plugin_prefs->EnablePluginGroup(
+      false, ASCIIToUTF16(chrome::ChromeContentClient::kPDFPluginName));
 }
 
 void PDFEnableAdobeReaderInfoBarDelegate::OnNo() {
   UserMetrics::RecordAction(UserMetricsAction("PDF_EnableReaderInfoBarCancel"));
 }
 
 // Launch the url to get the latest Adbobe Reader installer.
 void OpenReaderUpdateURL(TabContents* tab) {
   tab->OpenURL(GURL(kReaderUpdateUrl), GURL(), CURRENT_TAB,
                PageTransition::LINK);
 }
 
 // Opens the PDF using Adobe Reader.
 void OpenUsingReader(TabContentsWrapper* tab,
                      const WebPluginInfo& reader_plugin,
                      InfoBarDelegate* old_delegate,
                      InfoBarDelegate* new_delegate) {
   WebPluginInfo plugin = reader_plugin;
-  // The plugin is disabled, so enable it to get around the renderer check.
-  // Also give it a new version so that the renderer doesn't show the blocked
+  // Give the plugin a new version so that the renderer doesn't show the blocked
   // plugin UI if it's vulnerable, since we already went through the
   // interstitial.
-  plugin.enabled = WebPluginInfo::USER_ENABLED;
   plugin.version = ASCIIToUTF16("11.0.0.0");
 
   ChromePluginServiceFilter::GetInstance()->OverridePluginForTab(
       tab->render_view_host()->process()->id(),
       tab->render_view_host()->routing_id(),
       tab->tab_contents()->GetURL(),
       plugin);
   tab->render_view_host()->Send(new ViewMsg_ReloadFrame(
       tab->render_view_host()->routing_id()));
 
@@ skipping 117 matching lines @@
       tab_contents_(tab_contents),
       reader_installed_(!!reader_group),
       reader_vulnerable_(false) {
   if (!reader_installed_) {
     UserMetrics::RecordAction(
         UserMetricsAction("PDF_InstallReaderInfoBarShown"));
     return;
   }
 
   UserMetrics::RecordAction(UserMetricsAction("PDF_UseReaderInfoBarShown"));
-  std::vector<WebPluginInfo> plugins = reader_group->web_plugin_infos();
+  const std::vector<WebPluginInfo>& plugins =
+      reader_group->web_plugin_infos();
   DCHECK_EQ(plugins.size(), 1u);
   reader_webplugininfo_ = plugins[0];
 
-  reader_vulnerable_ = reader_group->IsVulnerable();
+  reader_vulnerable_ = reader_group->IsVulnerable(reader_webplugininfo_);
   if (!reader_vulnerable_) {
     scoped_ptr<Version> version(PluginGroup::CreateVersionFromString(
         reader_webplugininfo_.version));
     reader_vulnerable_ =
         version.get() && (version->components()[0] < kMinReaderVersionToUse);
   }
 }
 
 PDFUnsupportedFeatureInfoBarDelegate::~PDFUnsupportedFeatureInfoBarDelegate() {
 }
@@ skipping 73 matching lines @@
 
 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
   string16 reader_group_name(ASCIIToUTF16(PluginGroup::kAdobeReaderGroupName));
 
   // If the Reader plugin is disabled by policy, don't prompt them.
-  if (PluginGroup::IsPluginNameDisabledByPolicy(reader_group_name))
+  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];
       break;
     }
   }
 
   tab->infobar_tab_helper()->AddInfoBar(
       new PDFUnsupportedFeatureInfoBarDelegate(tab, reader_group));
 }