content/browser/download/download_browsertest.cc - Issue 10914158: Revert 155351 - Make DownloadManager::GetAllDownloads return all downloads regardless of state, per…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10914158: Revert 155351 - Make DownloadManager::GetAllDownloads return all downloads regardless of state, per… (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

« no previous file with comments | « chrome/browser/extensions/api/downloads/downloads_api_unittest.cc ('k') | content/browser/download/download_manager_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/download/download_browsertest.cc

===================================================================

--- content/browser/download/download_browsertest.cc (revision 155501)

+++ content/browser/download/download_browsertest.cc (working copy)

@@ -150,7 +150,7 @@

observer->WaitForFinished();

std::vector<DownloadItem*> downloads;

- DownloadManagerForShell(shell())->GetAllDownloads(&downloads);

+ DownloadManagerForShell(shell())->SearchDownloads(string16(), &downloads);

ASSERT_EQ(1u, downloads.size());

ASSERT_EQ(DownloadItem::IN_PROGRESS, downloads[0]->GetState());

@@ -175,7 +175,7 @@

observer1->WaitForFinished();

std::vector<DownloadItem*> downloads;

- DownloadManagerForShell(shell())->GetAllDownloads(&downloads);

+ DownloadManagerForShell(shell())->SearchDownloads(string16(), &downloads);

ASSERT_EQ(1u, downloads.size());

ASSERT_EQ(DownloadItem::IN_PROGRESS, downloads[0]->GetState());

DownloadItem* download1 = downloads[0]; // The only download.

@@ -188,7 +188,7 @@

// Should now have 2 items on the manager.

downloads.clear();

- DownloadManagerForShell(shell())->GetAllDownloads(&downloads);

+ DownloadManagerForShell(shell())->SearchDownloads(string16(), &downloads);

ASSERT_EQ(2u, downloads.size());

// We don't know the order of the downloads.

DownloadItem* download2 = downloads[(download1 == downloads[0]) ? 1 : 0];