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

chrome/browser/plugins/plugin_installer.h

 // 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.
 
 #ifndef CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_H_
 #define CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_H_
 
 #include "base/observer_list.h"
 #include "base/string16.h"
 #include "base/version.h"
@@ skipping 30 matching lines @@
   virtual void OnDownloadDestroyed(content::DownloadItem* download) OVERRIDE;
 
   void AddObserver(PluginInstallerObserver* observer);
   void RemoveObserver(PluginInstallerObserver* observer);
 
   void AddWeakObserver(WeakPluginInstallerObserver* observer);
   void RemoveWeakObserver(WeakPluginInstallerObserver* observer);
 
   InstallerState state() const { return state_; }
 
-  // Opens the download URL in a new tab. This method should only be called if
-  // |url_for_display| returns true.
-  void OpenDownloadURL(bool url_for_display,
-                       const GURL& plugin_url,
+  // Opens the download URL in a new tab.
+  void OpenDownloadURL(const GURL& plugin_url,
                        content::WebContents* web_contents);
 
   // Starts downloading the download URL and opens the downloaded file
-  // when finished. This method should only be called if |url_for_display|
-  // returns false.
-  void StartInstalling(bool url_for_display,
-                       const GURL& plugin_url,
-                       TabContents* tab_contents);
+  // when finished.
+  void StartInstalling(const GURL& plugin_url, TabContents* tab_contents);
 
  private:
   void DownloadStarted(scoped_refptr<content::DownloadManager> dlm,
                        content::DownloadId download_id,
                        net::Error error);
   void DownloadError(const std::string& msg);
   void DownloadCancelled();
 
   InstallerState state_;
   ObserverList<PluginInstallerObserver> observers_;
   ObserverList<WeakPluginInstallerObserver> weak_observers_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginInstaller);
 };
 
 #endif  // CHROME_BROWSER_PLUGINS_PLUGIN_INSTALLER_H_