chrome/browser/download/download_manager_unittest.cc - Issue 7983037: Revert 102126 - Make cancel remove cancelled download from active queues at time of cancel.

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: chrome/browser/download/download_manager_unittest.cc

Issue 7983037: Revert 102126 - Make cancel remove cancelled download from active queues at time of cancel. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 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/download/download_item_model.cc ('k') | chrome/browser/ui/cocoa/download/download_item_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/download/download_manager_unittest.cc

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

--- chrome/browser/download/download_manager_unittest.cc (revision 102135)

+++ chrome/browser/download/download_manager_unittest.cc (working copy)

@@ -534,7 +534,7 @@

simple_size,

simple_total));

- download->Cancel();

+ download->Cancel(true);

EXPECT_TRUE(observer->hit_state(DownloadItem::IN_PROGRESS));

EXPECT_TRUE(observer->hit_state(DownloadItem::INTERRUPTED));

@@ -630,7 +630,7 @@

download_item_model->GetStatusText());

// Clean up.

- download->Cancel();

+ download->Cancel(true);

message_loop_.RunAllPending();

}

@@ -676,10 +676,10 @@

download_file->AppendDataToFile(kTestData, kTestDataLen);

- download->Cancel();

+ download->Cancel(false);

message_loop_.RunAllPending();

- EXPECT_TRUE(GetActiveDownloadItem(0) == NULL);

+ EXPECT_TRUE(GetActiveDownloadItem(0) != NULL);

EXPECT_TRUE(observer->hit_state(DownloadItem::IN_PROGRESS));

EXPECT_TRUE(observer->hit_state(DownloadItem::CANCELLED));

EXPECT_FALSE(observer->hit_state(DownloadItem::INTERRUPTED));

« no previous file with comments | « chrome/browser/download/download_item_model.cc ('k') | chrome/browser/ui/cocoa/download/download_item_controller.mm » ('j') | no next file with comments »