Make DownloadHistory observe manager, items

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 c802b50e0d6ad5838814eb84439ff8815a40510d..0e46080f235f052bcb6a0e8862222b1563f56e6d 100644
--- a/content/public/test/download_test_observer.cc
+++ b/content/public/test/download_test_observer.cc
@@ -131,6 +131,29 @@ void DownloadTestObserver::OnDownloadUpdated(DownloadItem* download) {
     DownloadInFinalState(download);
 }
 
+void DownloadTestObserver::OnDownloadCreated(
+    DownloadManager* manager, DownloadItem* item) {
+  DCHECK_EQ(manager, download_manager_);
+  OnDownloadUpdated(item);
+
+  DownloadSet::const_iterator finished_it(finished_downloads_.find(item));

[Randy Smith (Not in Mondays), 2012/09/11 18:36:53]

How could item ever be in finished_downloads_ when OnDownloadCreated() is
called?  Won't that be the first time that anyone anywhere hears about the item?

[benjhayden, 2012/09/13 15:18:16]

OnDownloadUpdated() is called before this code. That method may call
DownloadInFinalState(), which adds the item to finished_downloads_.
Yes, this is gross. I'll probably rewrite DTO and its accomplices to use DUO and
HDIN before this CL is committed.

+  DownloadSet::iterator observed_it(downloads_observed_.find(item));
+
+  // 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);
+  }
+
+  // If it is finished and we are observing it, stop.
+  if (finished_it != finished_downloads_.end() &&
+      observed_it != downloads_observed_.end()) {
+    item->RemoveObserver(this);
+    downloads_observed_.erase(observed_it);
+  }
+}
+
 void DownloadTestObserver::ModelChanged(DownloadManager* manager) {
   DCHECK_EQ(manager, download_manager_);