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

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

Issue 148133007: [Downloads] Always call DM::StartDownload() for explicit downloads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comment updates Created 4 years, 10 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_target_determiner_unittest.cc
diff --git a/chrome/browser/download/download_target_determiner_unittest.cc b/chrome/browser/download/download_target_determiner_unittest.cc
index dea27dc90c190fcf69d9f0823ff37ae5b7fef148..26f67397b9caae1b78a73cdac0d0f77522bb45f7 100644
--- a/chrome/browser/download/download_target_determiner_unittest.cc
+++ b/chrome/browser/download/download_target_determiner_unittest.cc
@@ -878,17 +878,17 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_InactiveDownload) {
download_util::NOT_DANGEROUS, "http://example.com/foo.txt", "text/plain",
FILE_PATH_LITERAL(""),
- FILE_PATH_LITERAL(""), DownloadItem::TARGET_DISPOSITION_OVERWRITE,
+ FILE_PATH_LITERAL("foo.txt"), DownloadItem::TARGET_DISPOSITION_OVERWRITE,
- EXPECT_LOCAL_PATH},
+ EXPECT_CRDOWNLOAD},
{SAVE_AS, content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
download_util::NOT_DANGEROUS, "http://example.com/foo.txt", "text/plain",
FILE_PATH_LITERAL(""),
- FILE_PATH_LITERAL(""), DownloadItem::TARGET_DISPOSITION_PROMPT,
+ FILE_PATH_LITERAL("foo.txt"), DownloadItem::TARGET_DISPOSITION_PROMPT,
- EXPECT_LOCAL_PATH}};
+ EXPECT_CRDOWNLOAD}};
for (size_t i = 0; i < arraysize(kInactiveTestCases); ++i) {
SCOPED_TRACE(testing::Message() << "Running test case " << i);
@@ -897,10 +897,11 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_InactiveDownload) {
CreateActiveDownloadItem(i, test_case));
EXPECT_CALL(*item.get(), GetState())
.WillRepeatedly(Return(content::DownloadItem::CANCELLED));
- // Even though one is a SAVE_AS download, no prompt will be displayed to
- // the user because the download is inactive.
- EXPECT_CALL(*delegate(), PromptUserForDownloadPath(_, _, _))
- .Times(0);
+
+ EXPECT_CALL(*delegate(), PromptUserForDownloadPath(_, _, _)).Times(0);
+ EXPECT_CALL(*delegate(), NotifyExtensions(_, _, _)).Times(0);
+ EXPECT_CALL(*delegate(), ReserveVirtualPath(_, _, _, _, _)).Times(0);
+ EXPECT_CALL(*delegate(), DetermineLocalPath(_, _, _)).Times(1);
RunTestCase(test_case, base::FilePath(), item.get());
}
}

Powered by Google App Engine
This is Rietveld 408576698