| Index: chrome/browser/ssl/ssl_browser_tests.cc
|
| diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
|
| index 562f58f996fc569df84122d83792152ef1727413..44bd226296c082e4995cd2f6a89b15422b04406b 100644
|
| --- a/chrome/browser/ssl/ssl_browser_tests.cc
|
| +++ b/chrome/browser/ssl/ssl_browser_tests.cc
|
| @@ -277,8 +277,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestOKHTTPS) {
|
| }
|
|
|
| // Visits a page with https error and proceed:
|
| -// Disabled, http://crbug.com/68448.
|
| -IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestHTTPSExpiredCertAndProceed) {
|
| +IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndProceed) {
|
| ASSERT_TRUE(https_server_expired_.Start());
|
|
|
| ui_test_utils::NavigateToURL(browser(),
|
| @@ -789,8 +788,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestRunsCachedInsecureContent) {
|
|
|
| // This test ensures the CN invalid status does not 'stick' to a certificate
|
| // (see bug #1044942) and that it depends on the host-name.
|
| -// Disabled, see http://crbug.com/68448 and http://crbug.com/49377.
|
| -IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCNInvalidStickiness) {
|
| +IN_PROC_BROWSER_TEST_F(SSLUITest, TestCNInvalidStickiness) {
|
| ASSERT_TRUE(https_server_.Start());
|
| ASSERT_TRUE(https_server_mismatched_.Start());
|
|
|
| @@ -832,7 +830,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCNInvalidStickiness) {
|
| #endif
|
|
|
| // Test that navigating to a #ref does not change a bad security state.
|
| -IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestRefNavigation) {
|
| +IN_PROC_BROWSER_TEST_F(SSLUITest, TestRefNavigation) {
|
| ASSERT_TRUE(https_server_expired_.Start());
|
|
|
| ui_test_utils::NavigateToURL(browser(),
|
| @@ -899,9 +897,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestCloseTabWithUnsafePopup) {
|
| }
|
|
|
| // Visit a page over bad https that is a redirect to a page with good https.
|
| -// Crashes: http://crbug.com/77374
|
| -// Previously marked as flaky: http://crbug.com/40932
|
| -IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestRedirectBadToGoodHTTPS) {
|
| +IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectBadToGoodHTTPS) {
|
| ASSERT_TRUE(https_server_.Start());
|
| ASSERT_TRUE(https_server_expired_.Start());
|
|
|
| @@ -942,8 +938,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectGoodToBadHTTPS) {
|
| }
|
|
|
| // Visit a page over http that is a redirect to a page with good HTTPS.
|
| -// Disabled, http://crbug.com/70216.
|
| -IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestRedirectHTTPToGoodHTTPS) {
|
| +IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectHTTPToGoodHTTPS) {
|
| ASSERT_TRUE(test_server()->Start());
|
| ASSERT_TRUE(https_server_.Start());
|
|
|
| @@ -1015,8 +1010,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
|
| -// Disabled, http://crbug.com/18626.
|
| -IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestGoodFrameNavigation) {
|
| +IN_PROC_BROWSER_TEST_F(SSLUITest, TestGoodFrameNavigation) {
|
| ASSERT_TRUE(test_server()->Start());
|
| ASSERT_TRUE(https_server_.Start());
|
| ASSERT_TRUE(https_server_expired_.Start());
|
|
|