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);
-  ASSERT_TRUE(download->IsPartialDownload());
-  download->Cancel(true);
-  download->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
+  DownloadItem* download = download_manager->GetDownload(download_id);
+  if (download && (download->GetState() == DownloadItem::IN_PROGRESS)) {
+    download->Cancel(true);
+    download->Delete(DownloadItem::DELETE_DUE_TO_USER_DISCARD);
+  }
 }
 
 }  // namespace
 
 DownloadUpdatedObserver::DownloadUpdatedObserver(
     DownloadItem* item, DownloadUpdatedObserver::EventFilter filter)
     : item_(item),
       filter_(filter),
       waiting_(false),
       event_seen_(false) {
@@ skipping 46 matching lines @@
 
 DownloadTestObserver::~DownloadTestObserver() {
   for (DownloadSet::iterator it = downloads_observed_.begin();
        it != downloads_observed_.end(); ++it)
     (*it)->RemoveObserver(this);
 
   download_manager_->RemoveObserver(this);
 }
 
 void DownloadTestObserver::Init() {
-  download_manager_->AddObserver(this);  // Will call initial ModelChanged().
+  download_manager_->AddObserver(this);
+  // Regenerate DownloadItem observers.  If there are any download items
+  // in our final state, note them in |finished_downloads_|
+  // (done by |OnDownloadUpdated()|).
+  std::vector<DownloadItem*> downloads;
+  download_manager_->GetAllDownloads(&downloads);
+
+  for (std::vector<DownloadItem*>::iterator it = downloads.begin();
+       it != downloads.end(); ++it) {
+    OnDownloadUpdated(*it);  // Safe to call multiple times; checks state.
+
+    DownloadSet::const_iterator finished_it(finished_downloads_.find(*it));
+    DownloadSet::iterator observed_it(downloads_observed_.find(*it));
+
+    // If it isn't finished and we're aren't observing it, start.
+    if (finished_it == finished_downloads_.end() &&
+        observed_it == downloads_observed_.end()) {
+      (*it)->AddObserver(this);
+      downloads_observed_.insert(*it);
+    }
+  }
   finished_downloads_at_construction_ = finished_downloads_.size();
   states_observed_.clear();
 }
 
 void DownloadTestObserver::WaitForFinished() {
   if (!IsFinished()) {
     waiting_ = true;
     RunMessageLoop();
     waiting_ = false;
   }
@@ skipping 46 matching lines @@
 
       default:
         NOTREACHED();
     }
   }
 
   if (IsDownloadInFinalState(download))
     DownloadInFinalState(download);
 }
 
-void DownloadTestObserver::ModelChanged(DownloadManager* manager) {
-  DCHECK_EQ(manager, download_manager_);
+void DownloadTestObserver::OnDownloadCreated(
+    DownloadManager* manager, DownloadItem* item) {
+  OnDownloadUpdated(item);
+  DownloadSet::const_iterator finished_it(finished_downloads_.find(item));
+  DownloadSet::iterator observed_it(downloads_observed_.find(item));
 
-  // Regenerate DownloadItem observers.  If there are any download items
-  // in our final state, note them in |finished_downloads_|
-  // (done by |OnDownloadUpdated()|).
-  std::vector<DownloadItem*> downloads;
-  download_manager_->GetAllDownloads(&downloads);
-
-  for (std::vector<DownloadItem*>::iterator it = downloads.begin();
-       it != downloads.end(); ++it) {
-    OnDownloadUpdated(*it);  // Safe to call multiple times; checks state.
-
-    DownloadSet::const_iterator finished_it(finished_downloads_.find(*it));
-    DownloadSet::iterator observed_it(downloads_observed_.find(*it));
-
-    // If it isn't finished and we're aren't observing it, start.
-    if (finished_it == finished_downloads_.end() &&
-        observed_it == downloads_observed_.end()) {
-      (*it)->AddObserver(this);
-      downloads_observed_.insert(*it);
-      continue;
-    }
-
-    // If it is finished and we are observing it, stop.
-    if (finished_it != finished_downloads_.end() &&
-        observed_it != downloads_observed_.end()) {
-      (*it)->RemoveObserver(this);
-      downloads_observed_.erase(observed_it);
-      continue;
-    }
+  // If it isn't finished and we're aren't observing it, start.
+  if (finished_it == finished_downloads_.end() &&
+      observed_it == downloads_observed_.end()) {
+    item->AddObserver(this);
+    downloads_observed_.insert(item);
   }
 }
 
 size_t DownloadTestObserver::NumDangerousDownloadsSeen() const {
   return dangerous_downloads_seen_.size();
 }
 
 size_t DownloadTestObserver::NumDownloadsSeenInState(
     DownloadItem::DownloadState state) const {
   StateMap::const_iterator it = states_observed_.find(state);
@@ skipping 59 matching lines @@
   // instead.  In this case, it's because of |IsDownloadInFinalState()|.
   Init();
 }
 
 DownloadTestObserverInProgress::~DownloadTestObserverInProgress() {
 }
 
 
 bool DownloadTestObserverInProgress::IsDownloadInFinalState(
     DownloadItem* download) {
-  return (download->GetState() == DownloadItem::IN_PROGRESS);
+  return (download->GetState() == DownloadItem::IN_PROGRESS) &&
+      !download->GetTargetFilePath().empty();
 }
 
 DownloadTestFlushObserver::DownloadTestFlushObserver(
     DownloadManager* download_manager)
     : download_manager_(download_manager),
       waiting_for_zero_inprogress_(true) {}
 
 void DownloadTestFlushObserver::WaitForFlush() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   download_manager_->AddObserver(this);
@@ skipping 121 matching lines @@
     MessageLoopForUI::current()->Quit();
 }
 
 const DownloadUrlParameters::OnStartedCallback
     DownloadTestItemCreationObserver::callback() {
   return base::Bind(
       &DownloadTestItemCreationObserver::DownloadItemCreationCallback, this);
 }
 
 }  // namespace content