diff options
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index e1fd1a7..5c89ae7 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -435,11 +435,19 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoForward) { EXPECT_TRUE(entry2 == entry4); } +// Flaky on CrOS http://crbug.com/92292 +#if defined(OS_CHROMEOS) +#define MAYBE_TestHTTPSErrorWithNoNavEntry \ + DISABLED_TestHTTPSErrorWithNoNavEntry +#else +#define MAYBE_TestHTTPSErrorWithNoNavEntry TestHTTPSErrorWithNoNavEntry +#endif // defined(OS_CHROMEOS) + // Open a page with a HTTPS error in a tab with no prior navigation (through a // link with a blank target). This is to test that the lack of navigation entry // does not cause any problems (it was causing a crasher, see // http://crbug.com/19941). -IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSErrorWithNoNavEntry) { +IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSErrorWithNoNavEntry) { ASSERT_TRUE(https_server_expired_.Start()); GURL url = https_server_expired_.GetURL("files/ssl/google.htm"); |