| Index: chrome/browser/download/download_uitest.cc
|
| diff --git a/chrome/browser/download/download_uitest.cc b/chrome/browser/download/download_uitest.cc
|
| index 22fef7ac6b1b5aa4359a814257ac7bf0b5468bfb..9c7c2e3b297999ce85e47cbfbc9afe0d3568171d 100644
|
| --- a/chrome/browser/download/download_uitest.cc
|
| +++ b/chrome/browser/download/download_uitest.cc
|
| @@ -172,10 +172,10 @@ class DownloadTest : public UITest {
|
|
|
| // Download a file with non-viewable content, verify that the
|
| // download tab opened and the file exists.
|
| -// All download tests are disabled on all platforms, http://crbug.com/35275,
|
| +// All download tests are flaky on all platforms, http://crbug.com/35275,
|
| // http://crbug.com/48913 and especially http://crbug.com/50060.
|
| // Additionally, there is Windows-specific flake, http://crbug.com/20809.
|
| -TEST_F(DownloadTest, DISABLED_DownloadMimeType) {
|
| +TEST_F(DownloadTest, FLAKY_DownloadMimeType) {
|
| FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
|
|
|
| EXPECT_EQ(1, GetTabCount());
|
| @@ -196,7 +196,7 @@ TEST_F(DownloadTest, DISABLED_DownloadMimeType) {
|
| // All download tests are flaky on all platforms, http://crbug.com/35275,
|
| // http://crbug.com/48913 and especially http://crbug.com/50060.
|
| // Additionally, there is Windows-specific flake, http://crbug.com/20809.
|
| -TEST_F(DownloadTest, DISABLED_NoDownload) {
|
| +TEST_F(DownloadTest, FLAKY_NoDownload) {
|
| FilePath file(FILE_PATH_LITERAL("download-test2.html"));
|
| FilePath file_path = download_prefix_.Append(file);
|
|
|
| @@ -224,7 +224,7 @@ TEST_F(DownloadTest, DISABLED_NoDownload) {
|
| // All download tests are flaky on all platforms, http://crbug.com/35275,
|
| // http://crbug.com/48913 and especially http://crbug.com/50060.
|
| // Additionally, there is Windows-specific flake, http://crbug.com/20809.
|
| -TEST_F(DownloadTest, DISABLED_ContentDisposition) {
|
| +TEST_F(DownloadTest, FLAKY_ContentDisposition) {
|
| FilePath file(FILE_PATH_LITERAL("download-test3.gif"));
|
| FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif"));
|
|
|
| @@ -246,7 +246,7 @@ TEST_F(DownloadTest, DISABLED_ContentDisposition) {
|
| // All download tests are flaky on all platforms, http://crbug.com/35275,
|
| // http://crbug.com/48913 and especially http://crbug.com/50060.
|
| // Additionally, there is Windows-specific flake, http://crbug.com/20809.
|
| -TEST_F(DownloadTest, DISABLED_PerWindowShelf) {
|
| +TEST_F(DownloadTest, FLAKY_PerWindowShelf) {
|
| FilePath file(FILE_PATH_LITERAL("download-test3.gif"));
|
| FilePath download_file(FILE_PATH_LITERAL("download-test3-attachment.gif"));
|
|
|
| @@ -288,7 +288,7 @@ TEST_F(DownloadTest, DISABLED_PerWindowShelf) {
|
| // All download tests are flaky on all platforms, http://crbug.com/35275,
|
| // http://crbug.com/48913 and especially http://crbug.com/50060.
|
| // Additionally, there is Windows-specific flake, http://crbug.com/20809.
|
| -TEST_F(DownloadTest, DISABLED_UnknownSize) {
|
| +TEST_F(DownloadTest, FLAKY_UnknownSize) {
|
| GURL url(URLRequestSlowDownloadJob::kUnknownSizeUrl);
|
| FilePath filename;
|
| net::FileURLToFilePath(url, &filename);
|
| @@ -300,7 +300,7 @@ TEST_F(DownloadTest, DISABLED_UnknownSize) {
|
| // All download tests are flaky on all platforms, http://crbug.com/35275,
|
| // http://crbug.com/48913 and especially http://crbug.com/50060.
|
| // Additionally, there is Windows-specific flake, http://crbug.com/20809.
|
| -TEST_F(DownloadTest, DISABLED_KnownSize) {
|
| +TEST_F(DownloadTest, FLAKY_KnownSize) {
|
| GURL url(URLRequestSlowDownloadJob::kKnownSizeUrl);
|
| FilePath filename;
|
| net::FileURLToFilePath(url, &filename);
|
| @@ -314,7 +314,7 @@ TEST_F(DownloadTest, DISABLED_KnownSize) {
|
| // All download tests are flaky on all platforms, http://crbug.com/35275,
|
| // http://crbug.com/48913 and especially http://crbug.com/50060.
|
| // Additionally, there is Windows-specific flake, http://crbug.com/20809.
|
| -TEST_F(DownloadTest, DISABLED_IncognitoDownload) {
|
| +TEST_F(DownloadTest, FLAKY_IncognitoDownload) {
|
| // Open a regular window and sanity check default values for window / tab
|
| // count and shelf visibility.
|
| scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
|
| @@ -362,7 +362,7 @@ TEST_F(DownloadTest, DISABLED_IncognitoDownload) {
|
| // All download tests are flaky on all platforms, http://crbug.com/35275,
|
| // http://crbug.com/48913 and especially http://crbug.com/50060.
|
| // Additionally, there is Windows-specific flake, http://crbug.com/20809.
|
| -TEST_F(DownloadTest, DISABLED_DontCloseNewTab1) {
|
| +TEST_F(DownloadTest, FLAKY_DontCloseNewTab1) {
|
| scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
|
| ASSERT_TRUE(browser.get());
|
| int window_count = 0;
|
| @@ -384,7 +384,7 @@ TEST_F(DownloadTest, DISABLED_DontCloseNewTab1) {
|
| // All download tests are flaky on all platforms, http://crbug.com/35275,
|
| // http://crbug.com/48913 and especially http://crbug.com/50060.
|
| // Additionally, there is Windows-specific flake, http://crbug.com/20809.
|
| -TEST_F(DownloadTest, DISABLED_CloseNewTab1) {
|
| +TEST_F(DownloadTest, FLAKY_CloseNewTab1) {
|
| scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
|
| ASSERT_TRUE(browser.get());
|
| int window_count = 0;
|
| @@ -410,7 +410,7 @@ TEST_F(DownloadTest, DISABLED_CloseNewTab1) {
|
| // All download tests are flaky on all platforms, http://crbug.com/35275,
|
| // http://crbug.com/48913 and especially http://crbug.com/50060.
|
| // Additionally, there is Windows-specific flake, http://crbug.com/20809.
|
| -TEST_F(DownloadTest, DISABLED_DontCloseNewTab2) {
|
| +TEST_F(DownloadTest, FLAKY_DontCloseNewTab2) {
|
| scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
|
| ASSERT_TRUE(browser.get());
|
| int window_count = 0;
|
| @@ -437,7 +437,7 @@ TEST_F(DownloadTest, DISABLED_DontCloseNewTab2) {
|
| // All download tests are flaky on all platforms, http://crbug.com/35275,
|
| // http://crbug.com/48913 and especially http://crbug.com/50060.
|
| // Additionally, there is Windows-specific flake, http://crbug.com/20809.
|
| -TEST_F(DownloadTest, DISABLED_DontCloseNewTab3) {
|
| +TEST_F(DownloadTest, FLAKY_DontCloseNewTab3) {
|
| scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
|
| ASSERT_TRUE(browser.get());
|
| int window_count = 0;
|
| @@ -467,7 +467,7 @@ TEST_F(DownloadTest, DISABLED_DontCloseNewTab3) {
|
| // All download tests are flaky on all platforms, http://crbug.com/35275,
|
| // http://crbug.com/48913 and especially http://crbug.com/50060.
|
| // Additionally, there is Windows-specific flake, http://crbug.com/20809.
|
| -TEST_F(DownloadTest, DISABLED_CloseNewTab2) {
|
| +TEST_F(DownloadTest, FLAKY_CloseNewTab2) {
|
| scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
|
| ASSERT_TRUE(browser.get());
|
| int window_count = 0;
|
| @@ -494,7 +494,7 @@ TEST_F(DownloadTest, DISABLED_CloseNewTab2) {
|
| // All download tests are flaky on all platforms, http://crbug.com/35275,
|
| // http://crbug.com/48913 and especially http://crbug.com/50060.
|
| // Additionally, there is Windows-specific flake, http://crbug.com/20809.
|
| -TEST_F(DownloadTest, DISABLED_CloseNewTab3) {
|
| +TEST_F(DownloadTest, FLAKY_CloseNewTab3) {
|
| scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
|
| ASSERT_TRUE(browser.get());
|
| int window_count = 0;
|
| @@ -521,7 +521,7 @@ TEST_F(DownloadTest, DISABLED_CloseNewTab3) {
|
| // All download tests are flaky on all platforms, http://crbug.com/35275,
|
| // http://crbug.com/48913 and especially http://crbug.com/50060.
|
| // Additionally, there is Windows-specific flake, http://crbug.com/20809.
|
| -TEST_F(DownloadTest, DISABLED_DontCloseNewWindow) {
|
| +TEST_F(DownloadTest, FLAKY_DontCloseNewWindow) {
|
| scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
|
| ASSERT_TRUE(browser.get());
|
| int window_count = 0;
|
| @@ -546,7 +546,7 @@ TEST_F(DownloadTest, DISABLED_DontCloseNewWindow) {
|
| // All download tests are flaky on all platforms, http://crbug.com/35275,
|
| // http://crbug.com/48913 and especially http://crbug.com/50060.
|
| // Additionally, there is Windows-specific flake, http://crbug.com/20809.
|
| -TEST_F(DownloadTest, DISABLED_NewWindow) {
|
| +TEST_F(DownloadTest, FLAKY_NewWindow) {
|
| scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
|
| ASSERT_TRUE(browser.get());
|
| int window_count = 0;
|
|
|