Disable flaky SSL browser tests.

TBR=cthomp@chromium.org, rsleevi

Change-Id: Id59454fea00ef51fe6c4cf6aded5a2fd2c8a3b8e
Bug: 890372
Reviewed-on: https://chromium-review.googlesource.com/c/1318379Reviewed-by: danakj <danakj@chromium.org>
Commit-Queue: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#605421}

chrome/browser/ssl/ssl_browsertest.cc

@@ -3962,16 +3962,10 @@ IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest,
             security_info.content_with_cert_errors_status);
 }
 
-// Flaky on Windows 7 (dbg) trybot, see https://crbug.com/443374.
-#if defined(OS_WIN) && !defined(NDEBUG)
-#define MAYBE_MixedContentSettings DISABLED_MixedContentSettings
-#else
-#define MAYBE_MixedContentSettings MixedContentSettings
-#endif
-
 // This test checks the behavior of mixed content blocking for the requests
 // from a dedicated worker by changing the settings in WebPreferences.
-IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest, MAYBE_MixedContentSettings) {
+// TODO(crbug.com/890372): This test is flaky.
+IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest, DISABLED_MixedContentSettings) {
   ChromeContentBrowserClientForMixedContentTest browser_client;
   content::ContentBrowserClient* old_browser_client =
       content::SetBrowserClientForTesting(&browser_client);
@@ -4034,20 +4028,12 @@ IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest, MAYBE_MixedContentSettings) {
   content::SetBrowserClientForTesting(old_browser_client);
 }
 
-// Flaky on Windows 7 (dbg) trybot, see https://crbug.com/443374.
-#if defined(OS_WIN) && !defined(NDEBUG)
-#define MAYBE_MixedContentSettingsWithBlockingCSP \
-  DISABLED_MixedContentSettingsWithBlockingCSP
-#else
-#define MAYBE_MixedContentSettingsWithBlockingCSP \
-  MixedContentSettingsWithBlockingCSP
-#endif
-
 // This test checks that all mixed content requests from a dedicated worker are
 // blocked regardless of the settings in WebPreferences when
 // block-all-mixed-content CSP is set.
+// TODO(crbug.com/890372): This test is flaky.
 IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest,
-                       MAYBE_MixedContentSettingsWithBlockingCSP) {
+                       DISABLED_MixedContentSettingsWithBlockingCSP) {
   ChromeContentBrowserClientForMixedContentTest browser_client;
   content::ContentBrowserClient* old_browser_client =
       content::SetBrowserClientForTesting(&browser_client);
@@ -4081,17 +4067,12 @@ IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest,
   content::SetBrowserClientForTesting(old_browser_client);
 }
 
-// Flaky on Windows 7 bot, see https://crbug.com/874959.
-#if defined(OS_WIN)
-#define MAYBE_MixedContentSubFrame DISABLED_MixedContentSubFrame
-#else
-#define MAYBE_MixedContentSubFrame MixedContentSubFrame
-#endif
 // This test checks that all mixed content requests from a dedicated worker
 // which is started from a subframe are blocked if
 // allow_running_insecure_content setting is false or
 // strict_mixed_content_checking setting is true.
-IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest, MAYBE_MixedContentSubFrame) {
+// TODO(crbug.com/890372): This test is flaky.
+IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest, DISABLED_MixedContentSubFrame) {
   // TODO(carlosil): Reenable tests once confirmed not flaky for committed
   // interstitials.
   if (AreCommittedInterstitialsEnabled())