Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(952)

Unified Diff: chrome/browser/download/download_browsertest.cc

Issue 10913015: Reland DownloadManager::GetAllDownloads actually does now (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/download/download_browsertest.cc
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index f4fb4a58b539e86fdc079726ed725efa26679e93..21c0f3c2226703a6d26c8baf73e0ff90e27bc39b 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -216,7 +216,7 @@ class MockDownloadOpeningObserver : public 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) {
@@ -553,7 +553,7 @@ class DownloadTest : public InProcessBrowserTest {
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) {
@@ -1532,8 +1532,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, AutoOpen) {
// 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());
@@ -1748,7 +1747,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, SearchDownloads) {
// 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);
« no previous file with comments | « chrome/browser/chromeos/gdata/drive_download_observer.cc ('k') | chrome/browser/download/download_status_updater.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698