Reland DownloadManager::GetAllDownloads actually does now

chrome/browser/download/download_browsertest.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 <sstream>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 198 matching lines @@
   }
 
   ~MockDownloadOpeningObserver() {
     download_manager_->RemoveObserver(this);
   }
 
   // DownloadManager::Observer
   virtual void ModelChanged(DownloadManager* manager) OVERRIDE {
     DCHECK_EQ(manager, download_manager_);
     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) {
       (*it)->MockDownloadOpenForTesting();
     }
   }
 
  private:
   DownloadManager* download_manager_;
 
@@ skipping 316 matching lines @@
     // Delete the file we just downloaded.
     EXPECT_TRUE(file_util::DieFileDie(download_path, true));
     EXPECT_FALSE(file_util::PathExists(download_path));
 
     return true;
   }
 
   void GetDownloads(Browser* browser, std::vector<DownloadItem*>* downloads) {
     DCHECK(downloads);
     DownloadManager* manager = DownloadManagerForBrowser(browser);
-    manager->SearchDownloads(string16(), downloads);
+    manager->GetAllDownloads(downloads);
   }
 
   static void ExpectWindowCountAfterDownload(size_t expected) {
     EXPECT_EQ(expected, BrowserList::size());
   }
 
   void EnableFileChooser(bool enable) {
     file_chooser_observer_->EnableFileChooser(enable);
   }
 
@@ skipping 958 matching lines @@
       GetDownloadPrefs(browser())->EnableAutoOpenBasedOnExtension(file));
 
   // Mock out external opening on all downloads until end of test.
   MockDownloadOpeningObserver observer(
       DownloadManagerForBrowser(browser()));
 
   DownloadAndWait(browser(), url);
 
   // Find the download and confirm it was opened.
   std::vector<DownloadItem*> downloads;
-  DownloadManagerForBrowser(browser())->SearchDownloads(
-      string16(), &downloads);
+  DownloadManagerForBrowser(browser())->GetAllDownloads(&downloads);
   ASSERT_EQ(1u, downloads.size());
   EXPECT_EQ(DownloadItem::COMPLETE, downloads[0]->GetState());
   EXPECT_TRUE(downloads[0]->GetOpened());
 
   // As long as we're here, confirmed everything else is good.
   EXPECT_EQ(1, browser()->tab_count());
   CheckDownload(browser(), file, file);
   // Download shelf should close. Download panel stays open on ChromeOS.
   EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
 }
@@ skipping 194 matching lines @@
   std::vector<DownloadPersistentStoreInfo> entries(
       population_entries, population_entries + arraysize(population_entries));
 
   // Populate the manager.
   DownloadManager* manager = DownloadManagerForBrowser(browser());
   manager->OnPersistentStoreQueryComplete(&entries);
 
   // Do some searches and check the results.
   std::vector<DownloadItem*> search_results;
 
-  manager->SearchDownloads(string16(), &search_results);
+  manager->GetAllDownloads(&search_results);
   ASSERT_EQ(3u, search_results.size());
   std::sort(search_results.begin(), search_results.end(),
             DownloadItemSorter);
   // We do a full check only once to protect against the data
   // somehow getting scrambled on its way into the DownloadItems.
   {
     DownloadItem* d1 = search_results[0];
     DownloadItem* d2 = search_results[1];
     DownloadItem* d3 = search_results[2];
     EXPECT_EQ(FilePath(FILE_PATH_LITERAL("/path/to/file")), d1->GetFullPath());
@@ skipping 585 matching lines @@
   GetDownloads(browser(), &download_items);
   ASSERT_EQ(1u, download_items.size());
   ASSERT_EQ(test_server()->GetURL("echoheader?Referer"),
             download_items[0]->GetOriginalUrl());
 
   // Check that the file contains the expected referrer.
   FilePath file(download_items[0]->GetFullPath());
   std::string expected_contents = test_server()->GetURL("").spec();
   ASSERT_TRUE(VerifyFile(file, expected_contents, expected_contents.length()));
 }