summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-11 00:22:47 +0000
committerabarth@chromium.org <abarth@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-07-11 00:22:47 +0000
commit8e1e213993991873ac1508979bec7cf261d4e2ad (patch)
tree3174779bd41707277d005a7fe9b759384ca23178
parent7554ab8eb9971d8af26708e2108b4018b76a6a82 (diff)
downloadchromium_src-8e1e213993991873ac1508979bec7cf261d4e2ad.zip
chromium_src-8e1e213993991873ac1508979bec7cf261d4e2ad.tar.gz
chromium_src-8e1e213993991873ac1508979bec7cf261d4e2ad.tar.bz2
Disable SSLUITest.TestGoodFrameNavigation
We need to disable this test again because we need to revert to our previous mixed content iframe behavior. BUG=238484 TBR=cevans Review URL: https://codereview.chromium.org/18881010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210982 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ssl/ssl_browser_tests.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 1c0c5e1..68a12e3 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -1292,7 +1292,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestConnectToBadPort) {
// - navigate to a bad HTTPS (expect unsafe content and filtered frame), then
// back
// - navigate to HTTP (expect insecure content), then back
-IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) {
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestGoodFrameNavigation) {
ASSERT_TRUE(test_server()->Start());
ASSERT_TRUE(https_server_.Start());
ASSERT_TRUE(https_server_expired_.Start());