summaryrefslogtreecommitdiffstats
path: root/chrome/browser/download
diff options
context:
space:
mode:
authoryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-04 09:15:33 +0000
committeryurys@chromium.org <yurys@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-04 09:15:33 +0000
commit1a4eaf2b191a727db3c4c9bec9cdb9b64566bc02 (patch)
treef434996410e6cda2d3a73176bf7e02dfc4890937 /chrome/browser/download
parent2bec5fbcfdd2c4add4c8cfe7fae0633f3cdb25b1 (diff)
downloadchromium_src-1a4eaf2b191a727db3c4c9bec9cdb9b64566bc02.zip
chromium_src-1a4eaf2b191a727db3c4c9bec9cdb9b64566bc02.tar.gz
chromium_src-1a4eaf2b191a727db3c4c9bec9cdb9b64566bc02.tar.bz2
WebKit merge 130314:130368
BUG=153997 TBR=dpranke Review URL: https://codereview.chromium.org/11030025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@160108 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/download')
-rw-r--r--chrome/browser/download/download_browsertest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index a855886..6539558 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -2166,7 +2166,8 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadErrorReadonlyFolder) {
// Test that we show a dangerous downloads warning for a dangerous file
// downloaded through a blob: URL.
-IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadDangerousBlobData) {
+// Test started failing after WebKit r130343, see crbug.com/153997
+IN_PROC_BROWSER_TEST_F(DownloadTest, FAILS_DownloadDangerousBlobData) {
#if defined(OS_WIN)
// On Windows, if SafeBrowsing is enabled, certain file types (.exe, .cab,
// .msi) will be handled by the DownloadProtectionService. However, if the URL