Override plug-ins by path instead of name.

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"
@@ skipping 38 matching lines @@
 using content::OpenURLParams;
 using content::PluginService;
 using content::Referrer;
 using content::UserMetricsAction;
 using content::WebContents;
 using webkit::npapi::PluginGroup;
 using webkit::WebPluginInfo;
 
 namespace {
 
-static const char kReaderUpdateUrl[] =
+static const char kAdobeReaderIdentifier[] = "adobe-reader";
+static const char kAdobeReaderUpdateUrl[] =
     "http://www.adobe.com/go/getreader_chrome";
 
 // The info bar delegate used to ask the user if they want to use Adobe Reader
 // by default.  We want the infobar to have [No][Yes], so we swap the text on
 // the buttons, and the meaning of the delegate callbacks.
 class PDFEnableAdobeReaderInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   explicit PDFEnableAdobeReaderInfoBarDelegate(
       InfoBarTabHelper* infobar_helper,
       Profile* profile);
@@ skipping 67 matching lines @@
       false, ASCIIToUTF16(chrome::ChromeContentClient::kPDFPluginName));
 }
 
 void PDFEnableAdobeReaderInfoBarDelegate::OnNo() {
   content::RecordAction(UserMetricsAction("PDF_EnableReaderInfoBarCancel"));
 }
 
 // Launch the url to get the latest Adbobe Reader installer.
 void OpenReaderUpdateURL(WebContents* tab) {
   OpenURLParams params(
-      GURL(kReaderUpdateUrl), Referrer(), NEW_FOREGROUND_TAB,
+      GURL(kAdobeReaderUpdateUrl), Referrer(), NEW_FOREGROUND_TAB,
       content::PAGE_TRANSITION_LINK, false);
   tab->OpenURL(params);
 }
 
 // Opens the PDF using Adobe Reader.
 void OpenUsingReader(TabContents* tab,
                      const WebPluginInfo& reader_plugin,
                      InfoBarDelegate* delegate) {
   ChromePluginServiceFilter::GetInstance()->OverridePluginForTab(
       tab->web_contents()->GetRenderProcessHost()->GetID(),
       tab->web_contents()->GetRenderViewHost()->GetRoutingID(),
       tab->web_contents()->GetURL(),
-      ASCIIToUTF16(PluginGroup::kAdobeReaderGroupName));
+      reader_plugin);
   tab->web_contents()->GetRenderViewHost()->ReloadFrame();
 
   if (delegate)
     tab->infobar_tab_helper()->AddInfoBar(delegate);
 }
 
 // An interstitial to be used when the user chooses to open a PDF using Adobe
 // Reader, but it is out of date.
 class PDFUnsupportedFeatureInterstitial
     : public content::InterstitialPageDelegate {
@@ skipping 48 matching lines @@
       return;
     }
 
     if (command == "1") {
       content::RecordAction(
           UserMetricsAction("PDF_ReaderInterstitialUpdate"));
       OpenReaderUpdateURL(tab_contents_->web_contents());
     } else if (command == "2") {
       content::RecordAction(
           UserMetricsAction("PDF_ReaderInterstitialIgnore"));
+      // Pretend that the plug-in is up-to-date so that we don't block it.
+      reader_webplugininfo_.version = ASCIIToUTF16("11.0.0.0");
       OpenUsingReader(tab_contents_, reader_webplugininfo_, NULL);
     } else {
       NOTREACHED();
     }
     interstitial_page_->Proceed();
   }
 
   virtual void OverrideRendererPrefs(
       content::RendererPreferences* prefs) OVERRIDE {
     renderer_preferences_util::UpdateFromSystemSettings(
@@ skipping 128 matching lines @@
                         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;
   PluginFinder* plugin_finder = PluginFinder::GetInstance();
   for (size_t i = 0; i < plugins.size(); ++i) {
     PluginMetadata* plugin_metadata =
         plugin_finder->GetPluginMetadata(plugins[i]);
-    if (reader_group_name == plugin_metadata->name()) {
-      DCHECK(!reader);
-      reader = &plugins[i];
+    if (plugin_metadata->identifier() != kAdobeReaderIdentifier)
+      continue;
+
+    DCHECK(!reader);
+    reader = &plugins[i];
+    // If the Reader plugin is disabled by policy, don't prompt them.
+    PluginPrefs* plugin_prefs = PluginPrefs::GetForProfile(tab->profile());
+    if (plugin_prefs->PolicyStatusForPlugin(plugin_metadata->name()) ==
+        PluginPrefs::POLICY_DISABLED) {
+      return;
     }
+    break;
   }
 
   scoped_ptr<OpenPDFInReaderPromptDelegate> prompt(
       new PDFUnsupportedFeaturePromptDelegate(tab, reader, plugin_finder));
   PDFTabHelper* pdf_tab_helper = PDFTabHelper::FromWebContents(web_contents);
   pdf_tab_helper->ShowOpenInReaderPrompt(prompt.Pass());
 }
 
 }  // namespace
 
 void PDFHasUnsupportedFeature(content::WebContents* web_contents) {
 #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.
   PluginService::GetInstance()->GetPlugins(base::Bind(&GotPluginsCallback,
       web_contents->GetRenderProcessHost()->GetID(),
       web_contents->GetRenderViewHost()->GetRoutingID()));
 #endif
 }