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

chrome/browser/plugins/plugin_installer.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_installer.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_util.h"
 #include "base/process.h"
@@ skipping 111 matching lines @@
 
 void PluginInstaller::AddWeakObserver(WeakPluginInstallerObserver* observer) {
   weak_observers_.AddObserver(observer);
 }
 
 void PluginInstaller::RemoveWeakObserver(
     WeakPluginInstallerObserver* observer) {
   weak_observers_.RemoveObserver(observer);
 }
 
-void PluginInstaller::StartInstalling(bool url_for_display,
-                                      const GURL& plugin_url,
+void PluginInstaller::StartInstalling(const GURL& plugin_url,
                                       TabContents* tab_contents) {
   DCHECK_EQ(INSTALLER_STATE_IDLE, state_);
-  DCHECK(url_for_display);
   state_ = INSTALLER_STATE_DOWNLOADING;
   FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadStarted());
   content::WebContents* web_contents = tab_contents->web_contents();
   DownloadManager* download_manager =
       BrowserContext::GetDownloadManager(tab_contents->profile());
   download_util::RecordDownloadSource(
       download_util::INITIATED_BY_PLUGIN_INSTALLER);
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&BeginDownload,
@@ skipping 20 matching lines @@
   // TODO(benjhayden): DCHECK(item && item->IsInProgress()) after figuring out
   // why DownloadStarted may get net:OK but an invalid id.
   if (!download_item) {
     DownloadError("Download not found");
     return;
   }
   download_item->SetOpenWhenComplete(true);
   download_item->AddObserver(this);
 }
 
-void PluginInstaller::OpenDownloadURL(bool url_for_display,
-                                      const GURL& plugin_url,
+void PluginInstaller::OpenDownloadURL(const GURL& plugin_url,
                                       content::WebContents* web_contents) {
   DCHECK_EQ(INSTALLER_STATE_IDLE, state_);
-  DCHECK(url_for_display);
   web_contents->OpenURL(content::OpenURLParams(
       plugin_url,
       content::Referrer(web_contents->GetURL(),
                         WebKit::WebReferrerPolicyDefault),
       NEW_FOREGROUND_TAB, content::PAGE_TRANSITION_TYPED, false));
   FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadFinished());
 }
 
 void PluginInstaller::DownloadError(const std::string& msg) {
   DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
   state_ = INSTALLER_STATE_IDLE;
   FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadError(msg));
 }
 
 void PluginInstaller::DownloadCancelled() {
   DCHECK_EQ(INSTALLER_STATE_DOWNLOADING, state_);
   state_ = INSTALLER_STATE_IDLE;
   FOR_EACH_OBSERVER(PluginInstallerObserver, observers_, DownloadCancelled());
 }