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 113 matching lines @@
 
       default:
         NOTREACHED();
     }
   }
 
   if (IsDownloadInFinalState(download))
     DownloadInFinalState(download);
 }
 
+void DownloadTestObserver::OnDownloadCreated(
+    DownloadManager* manager, DownloadItem* item) {
+  item->AddObserver(this);
+  downloads_observed_.insert(item);

[Randy Smith (Not in Mondays), 2012/08/28 13:11:49]

Why the addition?  I don't mind changing over, but I think of
OnDownloadCreated() as being the new method we're replacing ModelChanged() with,
so it's weird to see an observer using OnDownloadCreated() and still using
ModelChanged().

[benjhayden, 2012/09/10 19:02:56]

Done.

+}
+
 void DownloadTestObserver::ModelChanged(DownloadManager* manager) {
   DCHECK_EQ(manager, download_manager_);
 
   // 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(FilePath(), &downloads);
   // As a test class, we're generally interested in whatever's there,
   // so we include temporary downloads.
   download_manager_->GetTemporaryDownloads(FilePath(), &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.
+    // Usually, OnDownloadCreated should have started observing it.
     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()) {
@@ skipping 215 matching lines @@
     MessageLoopForUI::current()->Quit();
 }
 
 const DownloadUrlParameters::OnStartedCallback
     DownloadTestItemCreationObserver::callback() {
   return base::Bind(
       &DownloadTestItemCreationObserver::DownloadItemCreationCallback, this);
 }
 
 }  // namespace content