| 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 4993bb58c26e63d9a30de7806a2fa40c415eb845..5ba3244b213f5aa5b7072afaacc7a7d879539b6f 100644
|
| --- a/chrome/browser/ssl/ssl_browser_tests.cc
|
| +++ b/chrome/browser/ssl/ssl_browser_tests.cc
|
| @@ -1150,9 +1150,15 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestRunsCachedInsecureContent) {
|
| AuthState::DISPLAYED_INSECURE_CONTENT | AuthState::RAN_INSECURE_CONTENT);
|
| }
|
|
|
| +#if defined(OS_WIN)
|
| +// Flaky on Win7 debug (http://crbug.com/368280).
|
| +#define MAYBE_TestCNInvalidStickiness DISABLED_TestCNInvalidStickiness
|
| +#else
|
| +#define MAYBE_TestCNInvalidStickiness TestCNInvalidStickiness
|
| +#endif
|
| // This test ensures the CN invalid status does not 'stick' to a certificate
|
| // (see bug #1044942) and that it depends on the host-name.
|
| -IN_PROC_BROWSER_TEST_F(SSLUITest, TestCNInvalidStickiness) {
|
| +IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestCNInvalidStickiness) {
|
| ASSERT_TRUE(https_server_.Start());
|
| ASSERT_TRUE(https_server_mismatched_.Start());
|
|
|
|
|