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 62c47b1719a89e8f02056435f075ddda0335f91c..601b67e16865bff3250238d296d1429ce2af7446 100644
--- a/content/public/test/download_test_observer.cc
+++ b/content/public/test/download_test_observer.cc
@@ -109,25 +109,11 @@ DownloadTestObserver::~DownloadTestObserver() {
 
 void DownloadTestObserver::Init() {
   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);
-    }
+    OnDownloadCreated(download_manager_, *it);
   }
   finished_downloads_at_construction_ = finished_downloads_.size();
   states_observed_.clear();
@@ -197,7 +183,9 @@ void DownloadTestObserver::OnDownloadUpdated(DownloadItem* download) {
 
 void DownloadTestObserver::OnDownloadCreated(
     DownloadManager* manager, DownloadItem* item) {
+  DCHECK_EQ(manager, download_manager_);
   OnDownloadUpdated(item);
+
   DownloadSet::const_iterator finished_it(finished_downloads_.find(item));
   DownloadSet::iterator observed_it(downloads_observed_.find(item));