Shifted code for CheckInternetZoneIdentifier into its own test so its flakiness

chrome/browser/download/download_browsertest.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/scoped_temp_dir.h"
 #include "base/test/test_file_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 344 matching lines @@
     if (!downloaded_file_exists)
       return false;
 
     int64 origin_file_size = 0;
     int64 downloaded_file_size = 0;
     EXPECT_TRUE(file_util::GetFileSize(origin_file, &origin_file_size));
     EXPECT_TRUE(file_util::GetFileSize(downloaded_file, &downloaded_file_size));
     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);
     EXPECT_TRUE(downloaded_file_deleted);
     return downloaded_file_deleted;
   }
 
   // TODO(ahendrickson) -- |expected_title_in_progress| and
   // |expected_title_in_finished| need to be checked.
   bool RunSizeTest(Browser* browser,
@@ skipping 80 matching lines @@
 
   // 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());
 }
 
+#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.
 //
 // This test runs correctly, but leaves behind turds in the test user's
 // 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"));
   GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
 
   // Download the file and wait.  We expect the Select File dialog to appear
   // due to the MIME type.
   DownloadAndWait(browser(), url, EXPECT_SELECT_DIALOG);
 
   // Check state.
@@ skipping 25 matching lines @@
 // Download a 0-size file with a content-disposition header, verify that the
 // download tab opened and the file exists as the filename specified in the
 // header.  This also ensures we properly handle empty file downloads.
 // The download shelf should be visible in the current tab.
 //
 // Test is believed mostly good (non-flaky) in itself, but it
 // sometimes trips over underlying flakiness in the downloads
 // 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"));
   GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
   FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif"));
 
   // Download a file and wait.
   DownloadAndWait(browser(), url, EXPECT_NO_SELECT_DIALOG);
 
   CheckDownload(browser(), download_file, file);
 
   // Check state.
   EXPECT_EQ(1, browser()->tab_count());
   EXPECT_TRUE(browser()->window()->IsDownloadShelfVisible());
 }
 
 // Test that the download shelf is per-window by starting a download in one
 // tab, opening a second tab, closing the shelf, going back to the first tab,
 // and checking that the shelf is closed.
 //
 // 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"));
   GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
   FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif"));
 
   // Download a file and wait.
   DownloadAndWait(browser(), url, EXPECT_NO_SELECT_DIALOG);
 
   CheckDownload(browser(), download_file, file);
@@ skipping 27 matching lines @@
 // in the middle until the server receives a second request for
 // "download-finish".  At that time, the download will finish.
 // These tests don't currently test much due to holes in |RunSizeTest()|.  See
 // comments in that routine for details.
 
 // Test is believed mostly good (non-flaky) in itself, but it
 // very occasionally trips over underlying flakiness in the downloads
 // 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;
   net::FileURLToFilePath(url, &filename);
   filename = filename.BaseName();
   ASSERT_TRUE(RunSizeTest(browser(),
                           url,
                           L"32.0 KB - " + filename.ToWStringHack(),
                           L"100% - " + filename.ToWStringHack()));
 }
 
 // Test is believed mostly good (non-flaky) in itself, but it
 // very occasionally trips over underlying flakiness in the downloads
 // 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;
   net::FileURLToFilePath(url, &filename);
   filename = filename.BaseName();
   ASSERT_TRUE(RunSizeTest(browser(),
                           url,
                           L"71% - " + filename.ToWStringHack(),
                           L"100% - " + filename.ToWStringHack()));
 }
 
 // Test that when downloading an item in Incognito mode, we don't crash when
 // closing the last Incognito window (http://crbug.com/13983).
 // Also check that the download shelf is not visible after closing the
 // Incognito window.
 //
 // Test is believed mostly good (non-flaky) in itself, but it
 // sometimes trips over underlying flakiness in the downloads
 // 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));
 
   // Open an Incognito window.
   Browser* incognito = CreateIncognitoBrowser();  // Waits.
   ASSERT_TRUE(incognito);
   int window_count = BrowserList::size();
   EXPECT_EQ(2, window_count);
 
   // Download a file in the Incognito window and wait.
@@ skipping 48 matching lines @@
   EXPECT_EQ(2, browser()->tab_count());
   EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
 }
 
 // Download a file in a background tab. Verify that the tab is closed
 // automatically, and that the download shelf is visible in the current tab.
 //
 // 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));
 
   // Download a file in a new background tab and wait.  The tab is automatically
   // closed when the download begins.
   FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
   GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
   DownloadAndWaitWithDisposition(
       browser(),
       url,
@@ skipping 12 matching lines @@
 // a Javascript call.
 // Verify that we have 2 tabs, and the download shelf is visible in the current
 // tab.
 //
 // The download_page1.html page contains an openNew() function that opens a
 // tab and then downloads download-test1.lib.
 //
 // 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
   // downloading.
   FilePath file1(FILE_PATH_LITERAL("download_page1.html"));
   GURL url(URLRequestMockHTTPJob::GetMockUrl(file1));
 
   // Open a web page and wait.
   ui_test_utils::NavigateToURL(browser(), url);
 
@@ skipping 16 matching lines @@
 // then download a file in the new tab.
 // Verify that we have 2 tabs, and the download shelf is visible in the current
 // tab.
 //
 // The download_page2.html page contains an openNew() function that opens a
 // tab.
 //
 // 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
   // downloading.
   FilePath file1(FILE_PATH_LITERAL("download_page2.html"));
   GURL url1(URLRequestMockHTTPJob::GetMockUrl(file1));
 
   // Open a web page and wait.
   ui_test_utils::NavigateToURL(browser(), url1);
 
@@ skipping 26 matching lines @@
 // which will do so in a temporary tab.
 // Verify that we have 1 tab, and the download shelf is visible.
 //
 // The download_page3.html page contains an openNew() function that opens a
 // tab with download-test1.lib in the URL.  When the URL is determined to be
 // a download, the tab is closed automatically.
 //
 // 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
   // downloading.
   FilePath file1(FILE_PATH_LITERAL("download_page3.html"));
   GURL url(URLRequestMockHTTPJob::GetMockUrl(file1));
 
   // Open a web page and wait.
   ui_test_utils::NavigateToURL(browser(), url);
 
@@ skipping 17 matching lines @@
 // download a file in a new tab, which is closed automatically when the
 // download begins.
 // Verify that we have 1 tab, and the download shelf is visible.
 //
 // The download_page4.html page contains a form with download-test1.lib as the
 // action.
 //
 // 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
   // downloading.
   FilePath file1(FILE_PATH_LITERAL("download_page4.html"));
   GURL url(URLRequestMockHTTPJob::GetMockUrl(file1));
 
   // Open a web page and wait.
   ui_test_utils::NavigateToURL(browser(), url);
 
@@ skipping 21 matching lines @@
 // Close the new window.
 // Verify that we have 1 window, and the download shelf is not visible.
 //
 // Regression test for http://crbug.com/44454
 //
 // Test is believed mostly good (non-flaky) in itself, but it
 // sometimes trips over underlying flakiness in the downloads
 // 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"));
   GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
   Browser* first_browser = browser();
 
   // Download a file in a new window and wait.
   DownloadAndWaitWithDisposition(browser(),
                                  url,
                                  NEW_WINDOW,
@@ skipping 25 matching lines @@
   window_count = BrowserList::size();
   EXPECT_EQ(1, window_count);
   EXPECT_EQ(1, browser()->tab_count());
   // The download shelf should not be visible in the remaining window.
   EXPECT_FALSE(browser()->window()->IsDownloadShelfVisible());
 
   CheckDownload(browser(), file, file);
 }
 
 }  // namespace