From ab59bd1314378e0ed2819966d0920283f78e3996 Mon Sep 17 00:00:00 2001 From: "palmer@chromium.org" Date: Thu, 28 Nov 2013 06:48:07 +0000 Subject: Open HTML files in Chrome by default. BUG=323561 TEST=When downloading an HTML file, the button on the download shelf should open the file in a new tab in Chrome; the pop-up menu should have Open and Open In System Viewer options. Review URL: https://codereview.chromium.org/92153007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237715 0039d316-1c4b-4281-b951-d872f2087c98 --- .../download_target_determiner_unittest.cc | 66 +++++++++++----------- 1 file changed, 33 insertions(+), 33 deletions(-) (limited to '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 d5ecd99..aeff767 100644 --- a/chrome/browser/download/download_target_determiner_unittest.cc +++ b/chrome/browser/download/download_target_determiner_unittest.cc @@ -536,11 +536,11 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_Basic) { // 2: Automatic Dangerous AUTOMATIC, content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE, - "http://example.com/foo.html", "", + "http://example.com/foo.xml", "", FILE_PATH_LITERAL(""), FILE_PATH_LITERAL(""), - FILE_PATH_LITERAL("foo.html"), + FILE_PATH_LITERAL("foo.xml"), DownloadItem::TARGET_DISPOSITION_OVERWRITE, EXPECT_UNCONFIRMED @@ -561,11 +561,11 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_Basic) { }, }; - // The test assumes that .html files have a danger level of + // The test assumes that .xml files have a danger level of // ALLOW_ON_USER_GESTURE. ASSERT_EQ(download_util::ALLOW_ON_USER_GESTURE, download_util::GetFileDangerLevel( - base::FilePath(FILE_PATH_LITERAL("foo.html")))); + base::FilePath(FILE_PATH_LITERAL("foo.xml")))); RunTestCasesWithActiveItem(kBasicTestCases, arraysize(kBasicTestCases)); } @@ -1060,11 +1060,11 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_VisitedReferrer) { // 0: Safe download due to visiting referrer before. AUTOMATIC, content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, - "http://visited.example.com/foo.html", "text/html", + "http://visited.example.com/foo.xml", "application/xml", FILE_PATH_LITERAL(""), FILE_PATH_LITERAL(""), - FILE_PATH_LITERAL("foo.html"), + FILE_PATH_LITERAL("foo.xml"), DownloadItem::TARGET_DISPOSITION_OVERWRITE, EXPECT_CRDOWNLOAD @@ -1074,11 +1074,11 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_VisitedReferrer) { // 1: Dangerous due to not having visited referrer before. AUTOMATIC, content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE, - "http://not-visited.example.com/foo.html", "text/html", + "http://not-visited.example.com/foo.xml", "application/xml", FILE_PATH_LITERAL(""), FILE_PATH_LITERAL(""), - FILE_PATH_LITERAL("foo.html"), + FILE_PATH_LITERAL("foo.xml"), DownloadItem::TARGET_DISPOSITION_OVERWRITE, EXPECT_UNCONFIRMED @@ -1088,11 +1088,11 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_VisitedReferrer) { // 2: Safe because the user is being prompted. SAVE_AS, content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, - "http://not-visited.example.com/foo.html", "text/html", + "http://not-visited.example.com/foo.xml", "application/xml", FILE_PATH_LITERAL(""), FILE_PATH_LITERAL(""), - FILE_PATH_LITERAL("foo.html"), + FILE_PATH_LITERAL("foo.xml"), DownloadItem::TARGET_DISPOSITION_PROMPT, EXPECT_CRDOWNLOAD @@ -1102,22 +1102,22 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_VisitedReferrer) { // 3: Safe because of forced path. FORCED, content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, - "http://not-visited.example.com/foo.html", "text/html", - FILE_PATH_LITERAL("foo.html"), + "http://not-visited.example.com/foo.xml", "application/xml", + FILE_PATH_LITERAL("foo.xml"), FILE_PATH_LITERAL(""), - FILE_PATH_LITERAL("foo.html"), + FILE_PATH_LITERAL("foo.xml"), DownloadItem::TARGET_DISPOSITION_OVERWRITE, EXPECT_LOCAL_PATH }, }; - // This test assumes that the danger level of .html files is + // This test assumes that the danger level of .xml files is // ALLOW_ON_USER_GESTURE. ASSERT_EQ(download_util::ALLOW_ON_USER_GESTURE, download_util::GetFileDangerLevel( - base::FilePath(FILE_PATH_LITERAL("foo.html")))); + base::FilePath(FILE_PATH_LITERAL("foo.xml")))); // First the history service must exist. ASSERT_TRUE(profile()->CreateHistoryService(false, false)); @@ -1329,11 +1329,11 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_NotifyExtensionsSafe) { // 2: Automatic Dangerous AUTOMATIC, content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE, - "http://example.com/foo.html", "", + "http://example.com/foo.xml", "", FILE_PATH_LITERAL(""), FILE_PATH_LITERAL(""), - FILE_PATH_LITERAL("overridden/foo.html"), + FILE_PATH_LITERAL("overridden/foo.xml"), DownloadItem::TARGET_DISPOSITION_OVERWRITE, EXPECT_UNCONFIRMED @@ -1368,11 +1368,11 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_NotifyExtensionsUnsafe) { // 0: Automatic Safe : Later overridden by a dangerous filetype. AUTOMATIC, content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE, - "http://example.com/foo.html.remove", "text/plain", + "http://example.com/foo.xml.remove", "text/plain", FILE_PATH_LITERAL(""), FILE_PATH_LITERAL(""), - FILE_PATH_LITERAL("overridden/foo.html"), + FILE_PATH_LITERAL("overridden/foo.xml"), DownloadItem::TARGET_DISPOSITION_OVERWRITE, EXPECT_UNCONFIRMED @@ -1566,11 +1566,11 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_ResumedNoPrompt) { // been prompted before. AUTOMATIC, content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE, - "http://example.com/foo.html", "", + "http://example.com/foo.xml", "", FILE_PATH_LITERAL(""), FILE_PATH_LITERAL(""), - FILE_PATH_LITERAL("foo.html"), + FILE_PATH_LITERAL("foo.xml"), DownloadItem::TARGET_DISPOSITION_OVERWRITE, EXPECT_UNCONFIRMED @@ -1591,11 +1591,11 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_ResumedNoPrompt) { }, }; - // The test assumes that .html files have a danger level of + // The test assumes that .xml files have a danger level of // ALLOW_ON_USER_GESTURE. ASSERT_EQ(download_util::ALLOW_ON_USER_GESTURE, download_util::GetFileDangerLevel( - base::FilePath(FILE_PATH_LITERAL("foo.html")))); + base::FilePath(FILE_PATH_LITERAL("foo.xml")))); for (size_t i = 0; i < arraysize(kResumedTestCases); ++i) { SCOPED_TRACE(testing::Message() << "Running test case " << i); const DownloadTestCase& test_case = kResumedTestCases[i]; @@ -1701,22 +1701,22 @@ TEST_F(DownloadTargetDeterminerTest, TargetDeterminer_ResumedWithPrompt) { // 2: Automatic Dangerous AUTOMATIC, content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, - "http://example.com/foo.html", "", + "http://example.com/foo.xml", "", FILE_PATH_LITERAL(""), FILE_PATH_LITERAL(""), - FILE_PATH_LITERAL("foo.html"), + FILE_PATH_LITERAL("foo.xml"), DownloadItem::TARGET_DISPOSITION_PROMPT, EXPECT_CRDOWNLOAD }, }; - // The test assumes that .html files have a danger level of + // The test assumes that .xml files have a danger level of // ALLOW_ON_USER_GESTURE. ASSERT_EQ(download_util::ALLOW_ON_USER_GESTURE, download_util::GetFileDangerLevel( - base::FilePath(FILE_PATH_LITERAL("foo.html")))); + base::FilePath(FILE_PATH_LITERAL("foo.xml")))); for (size_t i = 0; i < arraysize(kResumedTestCases); ++i) { SCOPED_TRACE(testing::Message() << "Running test case " << i); download_prefs()->SetSaveFilePath(test_download_dir()); @@ -1799,11 +1799,11 @@ TEST_F(DownloadTargetDeterminerTest, // 2: Automatic Dangerous AUTOMATIC, content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE, - "http://example.com/foo.html", "", + "http://example.com/foo.xml", "", FILE_PATH_LITERAL(""), FILE_PATH_LITERAL(""), - FILE_PATH_LITERAL("foo.html"), + FILE_PATH_LITERAL("foo.xml"), DownloadItem::TARGET_DISPOSITION_OVERWRITE, EXPECT_UNCONFIRMED @@ -1817,11 +1817,11 @@ TEST_F(DownloadTargetDeterminerTest, // 3: Automatic Dangerous AUTOMATIC, content::DOWNLOAD_DANGER_TYPE_DANGEROUS_FILE, - "http://example.com/foo.html", "", + "http://example.com/foo.xml", "", FILE_PATH_LITERAL(""), FILE_PATH_LITERAL(""), - FILE_PATH_LITERAL("foo.html"), + FILE_PATH_LITERAL("foo.xml"), DownloadItem::TARGET_DISPOSITION_OVERWRITE, EXPECT_UNCONFIRMED @@ -1853,11 +1853,11 @@ TEST_F(DownloadTargetDeterminerTest, }, }; - // The test assumes that .html files have a danger level of + // The test assumes that .xml files have a danger level of // ALLOW_ON_USER_GESTURE. ASSERT_EQ(download_util::ALLOW_ON_USER_GESTURE, download_util::GetFileDangerLevel( - base::FilePath(FILE_PATH_LITERAL("foo.html")))); + base::FilePath(FILE_PATH_LITERAL("foo.xml")))); for (size_t i = 0; i < ARRAYSIZE_UNSAFE(kIntermediateNameTestCases); ++i) { SCOPED_TRACE(testing::Message() << "Running test case " << i); -- cgit v1.1