Reland DownloadManager::GetAllDownloads actually does now

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..5dbc4e93d9170b4aef1a17d4656e16c59e88c5e2 100644
--- a/content/public/test/download_test_observer.cc
+++ b/content/public/test/download_test_observer.cc
@@ -138,10 +138,7 @@ void DownloadTestObserver::ModelChanged(DownloadManager* manager) {
   // 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);
+  download_manager_->GetAllDownloads(&downloads);
 
   for (std::vector<DownloadItem*>::iterator it = downloads.begin();
        it != downloads.end(); ++it) {
@@ -293,9 +290,11 @@ void DownloadTestFlushObserver::CheckDownloadsInProgress(
     int count = 0;
 
     std::vector<DownloadItem*> downloads;
-    download_manager_->SearchDownloads(string16(), &downloads);
+    download_manager_->GetAllDownloads(&downloads);
     for (std::vector<DownloadItem*>::iterator it = downloads.begin();
          it != downloads.end(); ++it) {
+      if ((*it)->IsTemporary())
+        continue;

[Randy Smith (Not in Mondays), 2012/09/05 17:45:43]

I think you could let this include temporary downloads if you wanted.

[benjhayden, 2012/09/05 20:56:57]

Done.

       if ((*it)->GetState() == DownloadItem::IN_PROGRESS)
         count++;
       if (observe_downloads) {