Index: chrome/browser/ssl/ssl_browser_tests.cc |
=================================================================== |
--- chrome/browser/ssl/ssl_browser_tests.cc (revision 44081) |
+++ chrome/browser/ssl/ssl_browser_tests.cc (working copy) |
@@ -249,7 +249,8 @@ |
} |
// Visits a page with https error and then goes back using GoToOffset. |
-IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndGoBackViaMenu) { |
+// Marked as flaky, see bug 40932. |
+IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoBackViaMenu) { |
scoped_refptr<HTTPTestServer> http_server = PlainServer(); |
ASSERT_TRUE(http_server.get() != NULL); |
scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); |
@@ -401,7 +402,8 @@ |
// Visits a page with unsafe content and make sure that: |
// - frames content is replaced with warning |
// - images and scripts are filtered out entirely |
-IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeContents) { |
+// Marked as flaky, see bug 40932. |
+IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContents) { |
scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer(); |
ASSERT_TRUE(good_https_server.get() != NULL); |
scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); |
@@ -653,7 +655,8 @@ |
} |
// Visit a page over good https that is a redirect to a page with bad https. |
-IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectGoodToBadHTTPS) { |
+// Marked as flaky, see bug 40932. |
+IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectGoodToBadHTTPS) { |
scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer(); |
ASSERT_TRUE(good_https_server.get() != NULL); |
scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); |
@@ -717,7 +720,8 @@ |
// Visit a page over https that is a redirect to a page with http (to make sure |
// we don't keep the secure state). |
-IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectHTTPSToHTTP) { |
+// Marked as flaky, see bug 40932. |
+IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectHTTPSToHTTP) { |
scoped_refptr<HTTPTestServer> http_server = PlainServer(); |
ASSERT_TRUE(http_server.get() != NULL); |
scoped_refptr<HTTPSTestServer> https_server = GoodCertServer(); |
@@ -827,7 +831,8 @@ |
// From a bad HTTPS top frame: |
// - navigate to an OK HTTPS frame (expected to be still authentication broken). |
-IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadFrameNavigation) { |
+// Marked as flaky, see bug 40932. |
+IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestBadFrameNavigation) { |
scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer(); |
ASSERT_TRUE(good_https_server.get() != NULL); |
scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); |
@@ -908,7 +913,8 @@ |
EXPECT_FALSE(is_content_evil); |
} |
-IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeContentsInWorkerFiltered) { |
+// Marked as flaky, see bug 40932. |
+IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContentsInWorkerFiltered) { |
scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer(); |
ASSERT_TRUE(good_https_server.get() != NULL); |
scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); |