Reland DownloadManager::GetAllDownloads actually does now

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 120 matching lines @@
     DownloadInFinalState(download);
 }
 
 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);
+  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() &&
@@ skipping 131 matching lines @@
 
 // If we're waiting for that flush point, check the number
 // of downloads in the IN_PROGRESS state and take appropriate
 // action.  If requested, also observes all downloads while iterating.
 void DownloadTestFlushObserver::CheckDownloadsInProgress(
     bool observe_downloads) {
   if (waiting_for_zero_inprogress_) {
     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) {
         if (downloads_observed_.find(*it) == downloads_observed_.end()) {
           (*it)->AddObserver(this);
           downloads_observed_.insert(*it);
         }
         // Download items are forever, and we don't want to make
         // assumptions about future state transitions, so once we
         // start observing them, we don't stop until destruction.
@@ skipping 70 matching lines @@
     MessageLoopForUI::current()->Quit();
 }
 
 const DownloadUrlParameters::OnStartedCallback
     DownloadTestItemCreationObserver::callback() {
   return base::Bind(
       &DownloadTestItemCreationObserver::DownloadItemCreationCallback, this);
 }
 
 }  // namespace content