Remove DownloadManager::GetDownloadItem in favor of GetDownload()

content/public/test/download_test_observer.cc

Index: content/public/test/download_test_observer.cc
diff --git a/content/public/test/download_test_observer.cc b/content/public/test/download_test_observer.cc
index 85caf410ade5d3706840c7ca8ac9ebf8c7d99b43..f77020193d03c52d3962b324319d1d397ca51c5c 100644
--- a/content/public/test/download_test_observer.cc
+++ b/content/public/test/download_test_observer.cc
@@ -29,14 +29,15 @@ namespace {
 // Fake user click on "Accept".
 void AcceptDangerousDownload(scoped_refptr<DownloadManager> download_manager,
                              int32 download_id) {
-  DownloadItem* download = download_manager->GetDownloadItem(download_id);
-  download->DangerousDownloadValidated();
+  DownloadItem* download = download_manager->GetDownload(download_id);
+  if (download && (download->GetState() == DownloadItem::IN_PROGRESS))
+    download->DangerousDownloadValidated();
 }
 
 // Fake user click on "Deny".
 void DenyDangerousDownload(scoped_refptr<DownloadManager> download_manager,
                            int32 download_id) {
-  DownloadItem* download = download_manager->GetDownloadItem(download_id);
+  DownloadItem* download = download_manager->GetDownload(download_id);
   ASSERT_TRUE(download->IsPartialDownload());

[Randy Smith (Not in Mondays), 2012/09/13 18:52:44]

(Feel free to ignore; not a natural part of this CL) I find it weird that we'd
have this assertion here and not above; it doesn't seem like the two would be
different.   Looking at the code, I think that we could actually land here if we
aren't IN_PROGRESS, so duplicating the above logic might make sense.

[benjhayden, 2012/09/13 20:19:36]

Done.

   download->Cancel(true);
   download->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);