diff options
Diffstat (limited to 'chrome/browser/ssl/ssl_browser_tests.cc')
| -rw-r--r-- | chrome/browser/ssl/ssl_browser_tests.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index 974a2c5..1266be8 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -249,11 +249,16 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSErrorWithNoNavEntry) { EXPECT_EQ(2, browser()->tab_count()); EXPECT_EQ(1, browser()->selected_index()); + // TODO(jcampan|oshima): Following code waits forever on linux/views + // because LOAD_STOP notification is issued before WaitLorLoadStop + // is called. See http://crbug/28098. +#if !defined(OS_LINUX) || !defined(TOOLKIT_VIEWS) // Since the navigation was initiated by the renderer (when we clicked on the // link) and since the main page network request failed, we won't get a // navigation entry committed. So we'll just wait for the load to stop. ui_test_utils::WaitForLoadStop( &(browser()->GetSelectedTabContents()->controller())); +#endif // We should have an interstitial page showing. ASSERT_TRUE(browser()->GetSelectedTabContents()->interstitial_page()); |