Make DownloadHistory observe manager, items

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 91 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);
-  // 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();
 }
 
 void DownloadTestObserver::WaitForFinished() {
   if (!IsFinished()) {
     waiting_ = true;
     RunMessageLoop();
     waiting_ = false;
@@ skipping 49 matching lines @@
         NOTREACHED();
     }
   }
 
   if (IsDownloadInFinalState(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));
   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);
   }
 }
@@ skipping 210 matching lines @@
     MessageLoopForUI::current()->Quit();
 }
 
 const DownloadUrlParameters::OnStartedCallback
     DownloadTestItemCreationObserver::callback() {
   return base::Bind(
       &DownloadTestItemCreationObserver::DownloadItemCreationCallback, this);
 }
 
 }  // namespace content