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(

[Randy Smith (Not in Mondays), 2012/09/13 19:53:19]

It seems wrong to use *both* OnDownloadCreated() and ModelChanged() in any
class; would it be reasonable to nuke ModelChanged() here?  

[benjhayden, 2012/09/21 20:45:46]

Done.

+    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);
+  }
+
+  // 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_);
 
   // 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();
@@ skipping 232 matching lines @@
     MessageLoopForUI::current()->Quit();
 }
 
 const DownloadUrlParameters::OnStartedCallback
     DownloadTestItemCreationObserver::callback() {
   return base::Bind(
       &DownloadTestItemCreationObserver::DownloadItemCreationCallback, this);
 }
 
 }  // namespace content