summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-03 20:04:32 +0000
committerrdsmith@chromium.org <rdsmith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-03 20:04:32 +0000
commitf130ef429844fc2f99089fe3ffc09af0b187577b (patch)
tree1305a5cc43a4474065cc92ab8927727b432b59c1
parent2d7a2b73cdf70859fec25b349ce06baf04826161 (diff)
downloadchromium_src-f130ef429844fc2f99089fe3ffc09af0b187577b.zip
chromium_src-f130ef429844fc2f99089fe3ffc09af0b187577b.tar.gz
chromium_src-f130ef429844fc2f99089fe3ffc09af0b187577b.tar.bz2
Enabled Internet zone test.
BUG=20809 TEST=Try bots. Review URL: http://codereview.chromium.org/6602091 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76782 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/download/download_browsertest.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index deabc20..5e522f7 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -486,9 +486,7 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DownloadMimeType) {
#if defined(OS_WIN)
// Download a file and confirm that the zone identifier (on windows)
// is set to internet.
-// This is flaky due to http://crbug.com/20809. It's marked as
-// DISABLED because when the test fails it fails via a timeout.
-IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_CheckInternetZone) {
+IN_PROC_BROWSER_TEST_F(DownloadTest, CheckInternetZone) {
ASSERT_TRUE(InitialSetup(false));
FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
GURL url(URLRequestMockHTTPJob::GetMockUrl(file));