Merge 160403 - Fix crash when a download is requested for an outdated plugin.

chrome/browser/plugins/plugin_observer.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/plugins/plugin_observer.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 85 matching lines @@
   return l10n_util::GetStringFUTF16(IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_MSG,
                                     plugin_metadata_->name());
 }
 
 string16 ConfirmInstallDialogDelegate::GetAcceptButtonTitle() {
   return l10n_util::GetStringUTF16(
       IDS_PLUGIN_CONFIRM_INSTALL_DIALOG_ACCEPT_BUTTON);
 }
 
 void ConfirmInstallDialogDelegate::OnAccepted() {
-  installer()->StartInstalling(plugin_metadata_->url_for_display(),
-                               plugin_metadata_->plugin_url(),
+  installer()->StartInstalling(plugin_metadata_->plugin_url(),
                                TabContents::FromWebContents(web_contents_));
 }
 
 void ConfirmInstallDialogDelegate::OnCanceled() {
 }
 
 void ConfirmInstallDialogDelegate::DownloadStarted() {
   Cancel();
 }
 
@@ skipping 185 matching lines @@
           plugin_metadata.Pass(),
           callback);
 #endif
   infobar_helper->AddInfoBar(delegate);
 }
 
 void PluginObserver::InstallMissingPlugin(
     PluginInstaller* installer,
     scoped_ptr<PluginMetadata> plugin_metadata) {
   if (plugin_metadata->url_for_display()) {
-    installer->OpenDownloadURL(plugin_metadata->url_for_display(),
-                               plugin_metadata->plugin_url(),
-                               web_contents());
+    installer->OpenDownloadURL(plugin_metadata->plugin_url(), web_contents());
   } else {
     TabModalConfirmDialog::Create(
         new ConfirmInstallDialogDelegate(
             web_contents(), installer, plugin_metadata.Pass()),
             TabContents::FromWebContents(web_contents()));
   }
 }
 
 void PluginObserver::OnRemovePluginPlaceholderHost(int placeholder_id) {
   std::map<int, PluginPlaceholderHost*>::iterator it =
@@ skipping 23 matching lines @@
   InfoBarTabHelper* infobar_helper = tab_contents->infobar_tab_helper();
   infobar_helper->AddInfoBar(new SimpleAlertInfoBarDelegate(
       infobar_helper,
       &ResourceBundle::GetSharedInstance().GetNativeImageNamed(
           IDR_INFOBAR_PLUGIN_CRASHED),
       l10n_util::GetStringFUTF16(IDS_PLUGIN_INITIALIZATION_ERROR_PROMPT,
                                  plugin_name),
       true  /* auto_expire */));
 }