Remove DownloadManager::GetDownloadItem in favor of GetDownload()

chrome/browser/download/chrome_download_manager_delegate.cc

Index: chrome/browser/download/chrome_download_manager_delegate.cc
diff --git a/chrome/browser/download/chrome_download_manager_delegate.cc b/chrome/browser/download/chrome_download_manager_delegate.cc
index bf70cf5ffd2bcc8456484ec25ebbea88aa0b47b0..4492e420dd5ab4b45b4c9627273c096a7c3d3f52 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.cc
+++ b/chrome/browser/download/chrome_download_manager_delegate.cc
@@ -639,9 +639,8 @@ void ChromeDownloadManagerDelegate::CheckDownloadUrlDone(
     const content::DownloadTargetCallback& callback,
     DownloadProtectionService::DownloadCheckResult result) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DownloadItem* download =
-      download_manager_->GetActiveDownloadItem(download_id);
-  if (!download)
+  DownloadItem* download = download_manager_->GetDownload(download_id);
+  if (!download || (download->GetState() != DownloadItem::IN_PROGRESS))
     return;
 
   VLOG(2) << __FUNCTION__ << "() download = " << download->DebugString(false)
@@ -659,8 +658,8 @@ void ChromeDownloadManagerDelegate::CheckDownloadUrlDone(
 void ChromeDownloadManagerDelegate::CheckClientDownloadDone(
     int32 download_id,
     DownloadProtectionService::DownloadCheckResult result) {
-  DownloadItem* item = download_manager_->GetActiveDownloadItem(download_id);
-  if (!item)
+  DownloadItem* item = download_manager_->GetDownload(download_id);
+  if (!item || (item->GetState() != DownloadItem::IN_PROGRESS))
     return;
 
   VLOG(2) << __FUNCTION__ << "() download = " << item->DebugString(false)
@@ -704,7 +703,7 @@ void ChromeDownloadManagerDelegate::Observe(
   int download_id = crx_installers_[installer];
   crx_installers_.erase(installer.get());
 
-  DownloadItem* item = download_manager_->GetActiveDownloadItem(download_id);
+  DownloadItem* item = download_manager_->GetDownload(download_id);
   if (item)
     item->DelayedDownloadOpened(installer->did_handle_successfully());
 }
@@ -717,8 +716,8 @@ void ChromeDownloadManagerDelegate::CheckVisitedReferrerBeforeDone(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   DownloadItem* download =
-      download_manager_->GetActiveDownloadItem(download_id);
-  if (!download)
+      download_manager_->GetDownload(download_id);
+  if (!download || (download->GetState() != DownloadItem::IN_PROGRESS))
     return;
 
   bool should_prompt = (download->GetTargetDisposition() ==
@@ -828,8 +827,8 @@ void ChromeDownloadManagerDelegate::SubstituteDriveDownloadPathCallback(
     const FilePath& suggested_path) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DownloadItem* download =
-      download_manager_->GetActiveDownloadItem(download_id);
-  if (!download)
+      download_manager_->GetDownload(download_id);
+  if (!download || (download->GetState() != DownloadItem::IN_PROGRESS))
     return;
 
   GetReservedPath(
@@ -850,8 +849,8 @@ void ChromeDownloadManagerDelegate::OnPathReservationAvailable(
     bool reserved_path_verified) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DownloadItem* download =
-      download_manager_->GetActiveDownloadItem(download_id);
-  if (!download)
+      download_manager_->GetDownload(download_id);
+  if (!download || (download->GetState() != DownloadItem::IN_PROGRESS))
     return;
   if (should_prompt || !reserved_path_verified) {
     // If the target path could not be verified then the path was non-existant,
@@ -877,8 +876,8 @@ void ChromeDownloadManagerDelegate::OnTargetPathDetermined(
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   FilePath intermediate_path;
   DownloadItem* download =
-      download_manager_->GetActiveDownloadItem(download_id);
-  if (!download)
+      download_manager_->GetDownload(download_id);
+  if (!download || (download->GetState() != DownloadItem::IN_PROGRESS))
     return;
 
   // If |target_path| is empty, then that means that the user wants to cancel