summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ssl
diff options
context:
space:
mode:
authorhamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-06 12:00:29 +0000
committerhamaji@chromium.org <hamaji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-06 12:00:29 +0000
commit4bd778d6cd4e108a38caeda9b283f01691fe7ecf (patch)
tree5d2441a587628018f3028db08ceaa35b09c453c2 /chrome/browser/ssl
parentc564cc6d1f2ff72ad512bf85cfada553cdc971c3 (diff)
downloadchromium_src-4bd778d6cd4e108a38caeda9b283f01691fe7ecf.zip
chromium_src-4bd778d6cd4e108a38caeda9b283f01691fe7ecf.tar.gz
chromium_src-4bd778d6cd4e108a38caeda9b283f01691fe7ecf.tar.bz2
Disable SSLUITest.TestGoodFrameNavigation as it seems to be flaky.
BUG=18626 TEST=none TBR=jcampan Review URL: http://codereview.chromium.org/165047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22602 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
-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 78047d2..92d054c 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -564,7 +564,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 mixed content), then back
-IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) {
+IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestGoodFrameNavigation) {
scoped_refptr<HTTPTestServer> http_server = PlainServer();
scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer();
scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer();