Shifted code for CheckInternetZoneIdentifier into its own test so its flakiness

chrome/browser/download/download_browsertest.cc

Index: chrome/browser/download/download_browsertest.cc
diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
index d3372334113a0654b2222632ffbab4c422f2e1d6..ea6f93a392806e1e620351991ccc34e4eca41f0e 100644
--- a/chrome/browser/download/download_browsertest.cc
+++ b/chrome/browser/download/download_browsertest.cc
@@ -362,12 +362,6 @@ class DownloadTest : public InProcessBrowserTest {
     EXPECT_EQ(origin_file_size, downloaded_file_size);
     EXPECT_TRUE(file_util::ContentsEqual(downloaded_file, origin_file));
 
-#if defined(OS_WIN)
-    // Check if the Zone Identifier is correctly set.
-    if (file_util::VolumeSupportsADS(downloaded_file))
-      EXPECT_TRUE(file_util::HasInternetZoneIdentifier(downloaded_file));
-#endif
-
     // Delete the downloaded copy of the file.
     bool downloaded_file_deleted =
         file_util::DieFileDie(downloaded_file, false);
@@ -468,6 +462,29 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_DownloadMimeType) {
   EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());
 }
 
+#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.
+IN_PROC_BROWSER_TEST_F(DownloadTest, FLAKY_CheckInternetZone) {
+  ASSERT_TRUE(InitialSetup(false));
+  FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
+  GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
+
+  // Download the file and wait.  We do not expect the Select File dialog.
+  DownloadAndWait(browser(), url, EXPECT_NO_SELECT_DIALOG);
+
+  // Check state.
+  EXPECT_EQ(1, browser()->tab_count());
+  CheckDownload(browser(), file, file);
+  EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());
+
+  FilePath downloaded_file = GetDownloadDirectory(browser()).Append(file);
+  if (file_util::VolumeSupportsADS(downloaded_file))
+    EXPECT_TRUE(file_util::HasInternetZoneIdentifier(downloaded_file));
+}
+#endif
+
 // Put up a Select File dialog when the file is downloaded, due to its MIME
 // type.
 //
@@ -475,7 +492,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_DownloadMimeType) {
 // download directory because of http://crbug.com/62099.  No big loss; it
 // was primarily confirming DownloadsObserver wait on select file dialog
 // functionality anyway.
-// Additionally, there is Windows-specific flake, http://crbug.com/20809.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_DownloadMimeTypeSelect) {
   ASSERT_TRUE(InitialSetup(true));
   FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
@@ -521,7 +537,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, NoDownload) {
 // subsystem in in http://crbug.com/63237.  Until that bug is
 // fixed, this test should be considered flaky.  It's entered as
 // DISABLED since if 63237 does cause a failure, it'll be a timeout.
-// Additionally, there is Windows-specific flake, http://crbug.com/20809.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_ContentDisposition) {
   ASSERT_TRUE(InitialSetup(false));
   FilePath file(FILE_PATH_LITERAL("download-test3.gif"));
@@ -545,7 +560,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_ContentDisposition) {
 // The test sometimes trips over underlying flakiness in the downloads
 // subsystem in in http://crbug.com/63237.  It's entered as
 // DISABLED since if 63237 does cause a failure, it'll be a timeout.
-// Additionally, there is Windows-specific flake, http://crbug.com/20809.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_PerWindowShelf) {
   ASSERT_TRUE(InitialSetup(false));
   FilePath file(FILE_PATH_LITERAL("download-test3.gif"));
@@ -593,7 +607,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_PerWindowShelf) {
 // subsystem in in http://crbug.com/63237.  Until that bug is
 // fixed, this test should be considered flaky.  It's entered as
 // DISABLED since if 63237 does cause a failure, it'll be a timeout.
-// Additionally, there is Windows-specific flake, http://crbug.com/20809.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_UnknownSize) {
   GURL url(URLRequestSlowDownloadJob::kUnknownSizeUrl);
   FilePath filename;
@@ -610,7 +623,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_UnknownSize) {
 // subsystem in in http://crbug.com/63237.  Until that bug is
 // fixed, this test should be considered flaky.  It's entered as
 // DISABLED since if 63237 does cause a failure, it'll be a timeout.
-// Additionally, there is Windows-specific flake, http://crbug.com/20809.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_KnownSize) {
   GURL url(URLRequestSlowDownloadJob::kKnownSizeUrl);
   FilePath filename;
@@ -632,7 +644,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_KnownSize) {
 // subsystem in in http://crbug.com/63237.  Until that bug is
 // fixed, this test should be considered flaky.  It's entered as
 // DISABLED since if 63237 does cause a failure, it'll be a timeout.
-// Additionally, there is Windows-specific flake, http://crbug.com/20809.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_IncognitoDownload) {
   ASSERT_TRUE(InitialSetup(false));
 
@@ -701,7 +712,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DontCloseNewTab1) {
 // The test sometimes trips over underlying flakiness in the downloads
 // subsystem in http://crbug.com/63237.  It's entered as
 // DISABLED since if 63237 does cause a failure, it'll be a timeout.
-// Additionally, there is Windows-specific flake, http://crbug.com/20809.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_CloseNewTab1) {
   ASSERT_TRUE(InitialSetup(false));
 
@@ -734,7 +744,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_CloseNewTab1) {
 // The test sometimes trips over underlying flakiness in the downloads
 // subsystem in in http://crbug.com/63237.  It's entered as
 // DISABLED since if 63237 does cause a failure, it'll be a timeout.
-// Additionally, there is Windows-specific flake, http://crbug.com/20809.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_DontCloseNewTab2) {
   ASSERT_TRUE(InitialSetup(false));
   // Because it's an HTML link, it should open a web page rather than
@@ -771,7 +780,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_DontCloseNewTab2) {
 // The test sometimes trips over underlying flakiness in the downloads
 // subsystem in in http://crbug.com/63237.  It's entered as
 // DISABLED since if 63237 does cause a failure, it'll be a timeout.
-// Additionally, there is Windows-specific flake, http://crbug.com/20809.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_DontCloseNewTab3) {
   ASSERT_TRUE(InitialSetup(false));
   // Because it's an HTML link, it should open a web page rather than
@@ -818,7 +826,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_DontCloseNewTab3) {
 // The test sometimes trips over underlying flakiness in the downloads
 // subsystem in in http://crbug.com/63237.  It's entered as
 // DISABLED since if 63237 does cause a failure, it'll be a timeout.
-// Additionally, there is Windows-specific flake, http://crbug.com/20809.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_CloseNewTab2) {
   ASSERT_TRUE(InitialSetup(false));
   // Because it's an HTML link, it should open a web page rather than
@@ -856,7 +863,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_CloseNewTab2) {
 // The test sometimes trips over underlying flakiness in the downloads
 // subsystem in in http://crbug.com/63237.  It's entered as
 // DISABLED since if 63237 does cause a failure, it'll be a timeout.
-// Additionally, there is Windows-specific flake, http://crbug.com/20809.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_CloseNewTab3) {
   ASSERT_TRUE(InitialSetup(false));
   // Because it's an HTML link, it should open a web page rather than
@@ -898,7 +904,6 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_CloseNewTab3) {
 // subsystem in in http://crbug.com/63237.  Until that bug is
 // fixed, this test should be considered flaky.  It's entered as
 // DISABLED since if 63237 does cause a failure, it'll be a timeout.
-// Additionally, there is Windows-specific flake, http://crbug.com/20809.
 IN_PROC_BROWSER_TEST_F(DownloadTest, DISABLED_NewWindow) {
   ASSERT_TRUE(InitialSetup(false));
   FilePath file(FILE_PATH_LITERAL("download-test1.lib"));