| 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 2360705dbd73324ae3d23c14bd7bda92df460a2f..32b4d43abc944208fec11558033aabe4e21608b9 100644
|
| --- a/chrome/browser/ssl/ssl_browser_tests.cc
|
| +++ b/chrome/browser/ssl/ssl_browser_tests.cc
|
| @@ -260,6 +260,8 @@ class SSLUITest : public InProcessBrowserTest {
|
| void ProceedThroughInterstitial(WebContents* tab) {
|
| InterstitialPage* interstitial_page = tab->GetInterstitialPage();
|
| ASSERT_TRUE(interstitial_page);
|
| + ASSERT_EQ(SSLBlockingPage::kTypeForTesting,
|
| + interstitial_page->GetDelegateForTesting()->GetTypeForTesting());
|
| content::WindowedNotificationObserver observer(
|
| content::NOTIFICATION_LOAD_STOP,
|
| content::Source<NavigationController>(&tab->GetController()));
|
| @@ -532,6 +534,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSExpiredCertAndDontProceed) {
|
| // Simulate user clicking "Take me back".
|
| InterstitialPage* interstitial_page = tab->GetInterstitialPage();
|
| ASSERT_TRUE(interstitial_page);
|
| + ASSERT_EQ(SSLBlockingPage::kTypeForTesting,
|
| + interstitial_page->GetDelegateForTesting()->GetTypeForTesting());
|
| interstitial_page->DontProceed();
|
|
|
| // We should be back to the original good page.
|
| @@ -883,6 +887,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSErrorWithNoNavEntry) {
|
|
|
| // We should have an interstitial page showing.
|
| ASSERT_TRUE(tab2->GetInterstitialPage());
|
| + ASSERT_EQ(SSLBlockingPage::kTypeForTesting, tab2->GetInterstitialPage()
|
| + ->GetDelegateForTesting()
|
| + ->GetTypeForTesting());
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadHTTPSDownload) {
|
| @@ -927,6 +934,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadHTTPSDownload) {
|
| WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
|
| ASSERT_TRUE(tab != NULL);
|
| ASSERT_TRUE(tab->GetInterstitialPage() != NULL);
|
| + ASSERT_EQ(
|
| + SSLBlockingPage::kTypeForTesting,
|
| + tab->GetInterstitialPage()->GetDelegateForTesting()->GetTypeForTesting());
|
| {
|
| content::WindowedNotificationObserver observer(
|
| chrome::NOTIFICATION_DOWNLOAD_INITIATED,
|
| @@ -940,6 +950,9 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadHTTPSDownload) {
|
| // NAV_ENTRY_COMMITTED notification because going back with an
|
| // active interstitial simply hides the interstitial.
|
| ASSERT_TRUE(tab->GetInterstitialPage() != NULL);
|
| + ASSERT_EQ(
|
| + SSLBlockingPage::kTypeForTesting,
|
| + tab->GetInterstitialPage()->GetDelegateForTesting()->GetTypeForTesting());
|
| EXPECT_TRUE(chrome::CanGoBack(browser()));
|
| chrome::GoBack(browser(), CURRENT_TAB);
|
|
|
| @@ -1840,6 +1853,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestInterstitialJavaScriptProceeds) {
|
| content::NOTIFICATION_LOAD_STOP,
|
| content::Source<NavigationController>(&tab->GetController()));
|
| InterstitialPage* interstitial_page = tab->GetInterstitialPage();
|
| + ASSERT_EQ(SSLBlockingPage::kTypeForTesting,
|
| + interstitial_page->GetDelegateForTesting()->GetTypeForTesting());
|
| content::RenderViewHost* interstitial_rvh =
|
| interstitial_page->GetMainFrame()->GetRenderViewHost();
|
| int result = -1;
|
| @@ -1872,6 +1887,8 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestInterstitialJavaScriptGoesBack) {
|
| content::NOTIFICATION_RENDER_WIDGET_HOST_DESTROYED,
|
| content::NotificationService::AllSources());
|
| InterstitialPage* interstitial_page = tab->GetInterstitialPage();
|
| + ASSERT_EQ(SSLBlockingPage::kTypeForTesting,
|
| + interstitial_page->GetDelegateForTesting()->GetTypeForTesting());
|
| content::RenderViewHost* interstitial_rvh =
|
| interstitial_page->GetMainFrame()->GetRenderViewHost();
|
| int result = -1;
|
|
|