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

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

Issue 2401143002: Don't prompt for download location on Android (Closed)
Patch Set: Created 4 years, 2 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_target_determiner.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 0b316164235dedd6ff406bed0fd76808d385478c..c69e36168c766f25fbb0b50dcaa36051ff09d47f 100644
--- a/chrome/browser/download/download_target_determiner_unittest.cc
+++ b/chrome/browser/download/download_target_determiner_unittest.cc
@@ -520,6 +520,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_Basic) {
EXPECT_CRDOWNLOAD},
+#if !BUILDFLAG(ANDROID_JAVA_UI)
{// 1: Save_As Safe
SAVE_AS, content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
DownloadFileType::NOT_DANGEROUS, "http://example.com/foo.txt",
@@ -528,6 +529,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_Basic) {
FILE_PATH_LITERAL("foo.txt"), DownloadItem::TARGET_DISPOSITION_PROMPT,
EXPECT_CRDOWNLOAD},
+#endif // !BUILDFLAG(ANDROID_JAVA_UI)
{// 2: Automatic Dangerous
AUTOMATIC, content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE,
@@ -557,6 +559,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_Basic) {
RunTestCasesWithActiveItem(kBasicTestCases, arraysize(kBasicTestCases));
}
+#if !BUILDFLAG(ANDROID_JAVA_UI)
TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_CancelSaveAs) {
const DownloadTestCase kCancelSaveAsTestCases[] = {
{// 0: Save_As Safe, Cancelled.
@@ -572,6 +575,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_CancelSaveAs) {
RunTestCasesWithActiveItem(kCancelSaveAsTestCases,
arraysize(kCancelSaveAsTestCases));
}
+#endif // !BUILDFLAG(ANDROID_JAVA_UI)
// The SafeBrowsing check is performed early. Make sure that a download item
// that has been marked as DANGEROUS_URL behaves correctly.
@@ -586,6 +590,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_DangerousUrl) {
EXPECT_UNCONFIRMED},
+#if !BUILDFLAG(ANDROID_JAVA_UI)
{// 1: Save As Dangerous URL
SAVE_AS, content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL,
DownloadFileType::NOT_DANGEROUS, "http://phishing.example.com/foo.txt",
@@ -594,6 +599,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_DangerousUrl) {
FILE_PATH_LITERAL("foo.txt"), DownloadItem::TARGET_DISPOSITION_PROMPT,
EXPECT_UNCONFIRMED},
+#endif // !BUILDFLAG(ANDROID_JAVA_UI)
{// 2: Forced Dangerous URL
FORCED, content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL,
@@ -616,6 +622,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_DangerousUrl) {
EXPECT_UNCONFIRMED},
+#if !BUILDFLAG(ANDROID_JAVA_UI)
{// 4: Save As Dangerous URL + Dangerous file
SAVE_AS, content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL,
DownloadFileType::NOT_DANGEROUS, "http://phishing.example.com/foo.html",
@@ -624,6 +631,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_DangerousUrl) {
FILE_PATH_LITERAL("foo.html"), DownloadItem::TARGET_DISPOSITION_PROMPT,
EXPECT_UNCONFIRMED},
+#endif // !BUILDFLAG(ANDROID_JAVA_UI)
{// 5: Forced Dangerous URL + Dangerous file
FORCED, content::DOWNLOAD_DANGER_TYPE_DANGEROUS_URL,
@@ -665,6 +673,8 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_MaybeDangerousContent) {
EXPECT_UNCONFIRMED},
+
+#if !BUILDFLAG(ANDROID_JAVA_UI)
{// 2: Save As Maybe dangerous content
SAVE_AS, content::DOWNLOAD_DANGER_TYPE_MAYBE_DANGEROUS_CONTENT,
DownloadFileType::NOT_DANGEROUS, "http://phishing.example.com/foo.crx",
@@ -673,6 +683,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_MaybeDangerousContent) {
FILE_PATH_LITERAL("foo.crx"), DownloadItem::TARGET_DISPOSITION_PROMPT,
EXPECT_UNCONFIRMED},
+#endif // !BUILDFLAG(ANDROID_JAVA_UI)
{// 3: Forced Maybe dangerous content
FORCED, content::DOWNLOAD_DANGER_TYPE_MAYBE_DANGEROUS_CONTENT,
@@ -700,6 +711,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_MaybeDangerousContent) {
arraysize(kSafeBrowsingTestCases));
}
+#if !BUILDFLAG(ANDROID_JAVA_UI)
// Test whether the last saved directory is used for 'Save As' downloads.
TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_LastSavePath) {
const DownloadTestCase kLastSavePathTestCasesPre[] = {
@@ -788,6 +800,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_LastSavePath) {
arraysize(kLastSavePathTestCasesVirtual));
}
}
+#endif // !BUILDFLAG(ANDROID_JAVA_UI)
// These tests are run with the default downloads folder set to a virtual
// directory.
@@ -815,6 +828,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_DefaultVirtual) {
RunTestCasesWithActiveItem(&kAutomaticDownloadToVirtualDir, 1);
}
+#if !BUILDFLAG(ANDROID_JAVA_UI)
{
SCOPED_TRACE(testing::Message() << "Save As to virtual directory");
const DownloadTestCase kSaveAsToVirtualDir = {
@@ -859,6 +873,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_DefaultVirtual) {
GetPathInDownloadDir(FILE_PATH_LITERAL("foo-x.txt")))));
RunTestCasesWithActiveItem(&kSaveAsToLocalDir, 1);
}
+#endif // !BUILDFLAG(ANDROID_JAVA_UI)
{
SCOPED_TRACE(testing::Message() << "Forced safe download");
@@ -890,13 +905,16 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_InactiveDownload) {
EXPECT_CRDOWNLOAD},
+#if !BUILDFLAG(ANDROID_JAVA_UI)
{SAVE_AS, content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
DownloadFileType::NOT_DANGEROUS, "http://example.com/foo.txt",
"text/plain", FILE_PATH_LITERAL(""),
FILE_PATH_LITERAL("foo.txt"), DownloadItem::TARGET_DISPOSITION_PROMPT,
- EXPECT_CRDOWNLOAD}};
+ EXPECT_CRDOWNLOAD}
+#endif // !BUILDFLAG(ANDROID_JAVA_UI)
+ };
for (size_t i = 0; i < arraysize(kInactiveTestCases); ++i) {
SCOPED_TRACE(testing::Message() << "Running test case " << i);
@@ -986,6 +1004,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_VisitedReferrer) {
EXPECT_UNCONFIRMED},
+#if !BUILDFLAG(ANDROID_JAVA_UI)
{// 2: Safe because the user is being prompted.
SAVE_AS, content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
DownloadFileType::NOT_DANGEROUS,
@@ -995,6 +1014,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_VisitedReferrer) {
FILE_PATH_LITERAL("foo.crx"), DownloadItem::TARGET_DISPOSITION_PROMPT,
EXPECT_CRDOWNLOAD},
+#endif // !BUILDFLAG(ANDROID_JAVA_UI)
{// 3: Safe because of forced path.
FORCED, content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
@@ -1150,6 +1170,7 @@ TEST_F(DownloadTargetDeterminerTest, TransitionType) {
}
}
+#if !BUILDFLAG(ANDROID_JAVA_UI)
// These test cases are run with "Prompt for download" user preference set to
// true.
TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_PromptAlways) {
@@ -1191,6 +1212,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_PromptAlways) {
RunTestCasesWithActiveItem(kPromptingTestCases,
arraysize(kPromptingTestCases));
}
+#endif // !BUILDFLAG(ANDROID_JAVA_UI)
#if defined(ENABLE_EXTENSIONS)
// These test cases are run with "Prompt for download" user preference set to
@@ -1283,6 +1305,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_NotifyExtensionsSafe) {
EXPECT_CRDOWNLOAD},
+#if !BUILDFLAG(ANDROID_JAVA_UI)
{// 1: Save_As Safe
SAVE_AS, content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
DownloadFileType::NOT_DANGEROUS, "http://example.com/foo.txt",
@@ -1292,6 +1315,7 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_NotifyExtensionsSafe) {
DownloadItem::TARGET_DISPOSITION_PROMPT,
EXPECT_CRDOWNLOAD},
+#endif // !BUILDFLAG(ANDROID_JAVA_UI)
{// 2: Automatic Dangerous
AUTOMATIC, content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE,
@@ -1407,6 +1431,7 @@ TEST_F(DownloadTargetDeterminerTest,
RunTestCase(test_case, base::FilePath(), item.get());
}
+#if !BUILDFLAG(ANDROID_JAVA_UI)
// Test that relative paths returned by extensions are always relative to the
// default downloads path.
TEST_F(DownloadTargetDeterminerTest,
@@ -1444,6 +1469,7 @@ TEST_F(DownloadTargetDeterminerTest,
ScheduleCallback(full_overridden_path)));
RunTestCase(test_case, base::FilePath(), item.get());
}
+#endif // !BUILDFLAG(ANDROID_JAVA_UI)
TEST_F(DownloadTargetDeterminerTest,
TargetDeterminer_InitialVirtualPathUnsafe) {
« no previous file with comments | « chrome/browser/download/download_target_determiner.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698