Remove DownloadManager::GetDownloadItem in favor of GetDownload()

content/public/test/download_test_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 "content/public/test/download_test_observer.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 11 matching lines @@
 // These functions take scoped_refptr's to DownloadManager because they
 // are posted to message queues, and hence may execute arbitrarily after
 // their actual posting.  Once posted, there is no connection between
 // these routines and the DownloadTestObserver class from which
 // they came, so the DownloadTestObserver's reference to the
 // DownloadManager cannot be counted on to keep the DownloadManager around.
 
 // 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);
 }
 
 }  // namespace
 
 DownloadTestObserver::DownloadTestObserver(
     DownloadManager* download_manager,
     size_t wait_count,
     DangerousDownloadAction dangerous_download_action)
@@ skipping 325 matching lines @@
     MessageLoopForUI::current()->Quit();
 }
 
 const DownloadUrlParameters::OnStartedCallback
     DownloadTestItemCreationObserver::callback() {
   return base::Bind(
       &DownloadTestItemCreationObserver::DownloadItemCreationCallback, this);
 }
 
 }  // namespace content