chrome/browser/download/download_manager_unittest.cc - Issue 7294013: Modified cancel and interrupt processing to avoid race with history.

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 7294013: Modified cancel and interrupt processing to avoid race with history. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fixed various problems surfaced by trybots. Created 9 years, 5 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:

Index: chrome/browser/download/download_manager_unittest.cc

diff --git a/chrome/browser/download/download_manager_unittest.cc b/chrome/browser/download/download_manager_unittest.cc

index 1b80445e90c552215797197ff0336beb71e35949..72533f13ed849bd7033e26fedfa3f3b4ad6f39fe 100644

--- a/chrome/browser/download/download_manager_unittest.cc

+++ b/chrome/browser/download/download_manager_unittest.cc

@@ -458,7 +458,7 @@ TEST_F(DownloadManagerTest, DownloadInterruptTest) {

simple_size,

simple_total));

- download->Cancel(true);

+ download->Cancel();

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

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

@@ -515,10 +515,10 @@ TEST_F(DownloadManagerTest, DownloadCancelTest) {

download_file->AppendDataToFile(kTestData, kTestDataLen);

- download->Cancel(false);

+ download->Cancel();

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));