| Index: chrome/browser/ssl/ssl_browser_tests.cc
|
| ===================================================================
|
| --- chrome/browser/ssl/ssl_browser_tests.cc (revision 44118)
|
| +++ chrome/browser/ssl/ssl_browser_tests.cc (working copy)
|
| @@ -173,7 +173,8 @@
|
|
|
| // Visits a page with https error and don't proceed (and ensure we can still
|
| // navigate at that point):
|
| -IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndDontProceed) {
|
| +// Marked as flaky, see bug 40932.
|
| +IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndDontProceed) {
|
| scoped_refptr<HTTPTestServer> http_server = PlainServer();
|
| ASSERT_TRUE(http_server.get() != NULL);
|
| scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer();
|
| @@ -278,7 +279,8 @@
|
| }
|
|
|
| // Visits a page with https error and then goes forward using GoToOffset.
|
| -IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndGoForward) {
|
| +// Marked as flaky, see bug 40932.
|
| +IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoForward) {
|
| scoped_refptr<HTTPTestServer> http_server = PlainServer();
|
| ASSERT_TRUE(http_server.get() != NULL);
|
| scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer();
|
| @@ -933,7 +935,8 @@
|
| CheckAuthenticatedState(tab, false, false);
|
| }
|
|
|
| -IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnsafeContentsInWorker) {
|
| +// Marked as flaky, see bug 40932.
|
| +IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContentsInWorker) {
|
| scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer();
|
| ASSERT_TRUE(good_https_server.get() != NULL);
|
| scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer();
|
|
|