Commit defd3adc authored by Carlos IL's avatar Carlos IL Committed by Commit Bot

Re-enabled committed interstitial tests for MixedContentSettings

Couldn't reproduce the flakiness in those tests, so re-enabling with
committed interstitials, will revert this CL if the flakiness returns.
Also: This tests seem to be flaky in general, even without committed
interstitials, e.g., crbug.com/874959

Bug: 863272
Change-Id: I64b5291513041e4dd9da9fa6125785fe4727a6c7
Reviewed-on: https://chromium-review.googlesource.com/1178928
Commit-Queue: Carlos IL <carlosil@chromium.org>
Reviewed-by: default avatarMustafa Emre Acer <meacer@chromium.org>
Cr-Commit-Position: refs/heads/master@{#585270}
parent e5c3f5be
...@@ -3899,10 +3899,6 @@ IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest, ...@@ -3899,10 +3899,6 @@ IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest,
// This test checks the behavior of mixed content blocking for the requests // This test checks the behavior of mixed content blocking for the requests
// from a dedicated worker by changing the settings in WebPreferences. // from a dedicated worker by changing the settings in WebPreferences.
IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest, MAYBE_MixedContentSettings) { IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest, MAYBE_MixedContentSettings) {
// TODO(carlosil): Reenable tests once confirmed not flaky for committed
// interstitials.
if (AreCommittedInterstitialsEnabled())
return;
ChromeContentBrowserClientForMixedContentTest browser_client; ChromeContentBrowserClientForMixedContentTest browser_client;
content::ContentBrowserClient* old_browser_client = content::ContentBrowserClient* old_browser_client =
content::SetBrowserClientForTesting(&browser_client); content::SetBrowserClientForTesting(&browser_client);
...@@ -3979,10 +3975,6 @@ IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest, MAYBE_MixedContentSettings) { ...@@ -3979,10 +3975,6 @@ IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest, MAYBE_MixedContentSettings) {
// block-all-mixed-content CSP is set. // block-all-mixed-content CSP is set.
IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest, IN_PROC_BROWSER_TEST_P(SSLUIWorkerFetchTest,
MAYBE_MixedContentSettingsWithBlockingCSP) { MAYBE_MixedContentSettingsWithBlockingCSP) {
// TODO(carlosil): Reenable tests once confirmed not flaky for committed
// interstitials.
if (AreCommittedInterstitialsEnabled())
return;
ChromeContentBrowserClientForMixedContentTest browser_client; ChromeContentBrowserClientForMixedContentTest browser_client;
content::ContentBrowserClient* old_browser_client = content::ContentBrowserClient* old_browser_client =
content::SetBrowserClientForTesting(&browser_client); content::SetBrowserClientForTesting(&browser_client);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment