| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/string_util.h" | 7 #include "base/string_util.h" |
| 8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
| 9 #include "base/time.h" | 9 #include "base/time.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 612 // http://crbug.com/19941). | 612 // http://crbug.com/19941). |
| 613 IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSErrorWithNoNavEntry) { | 613 IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSErrorWithNoNavEntry) { |
| 614 ASSERT_TRUE(https_server_expired_.Start()); | 614 ASSERT_TRUE(https_server_expired_.Start()); |
| 615 | 615 |
| 616 GURL url = https_server_expired_.GetURL("files/ssl/google.htm"); | 616 GURL url = https_server_expired_.GetURL("files/ssl/google.htm"); |
| 617 TabContents* tab2 = | 617 TabContents* tab2 = |
| 618 browser()->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); | 618 browser()->AddSelectedTabWithURL(url, content::PAGE_TRANSITION_TYPED); |
| 619 ui_test_utils::WaitForLoadStop(tab2->web_contents()); | 619 ui_test_utils::WaitForLoadStop(tab2->web_contents()); |
| 620 | 620 |
| 621 // Verify our assumption that there was no prior navigation. | 621 // Verify our assumption that there was no prior navigation. |
| 622 EXPECT_FALSE(browser()->command_updater()->IsCommandEnabled(IDC_BACK)); | 622 EXPECT_FALSE(chrome::CanGoBack(browser())); |
| 623 | 623 |
| 624 // We should have an interstitial page showing. | 624 // We should have an interstitial page showing. |
| 625 ASSERT_TRUE(tab2->web_contents()->GetInterstitialPage()); | 625 ASSERT_TRUE(tab2->web_contents()->GetInterstitialPage()); |
| 626 } | 626 } |
| 627 | 627 |
| 628 // Disabled due to crash in downloads code that this triggers. | 628 // Disabled due to crash in downloads code that this triggers. |
| 629 // http://crbug.com/95331 | 629 // http://crbug.com/95331 |
| 630 IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestBadHTTPSDownload) { | 630 IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestBadHTTPSDownload) { |
| 631 ASSERT_TRUE(test_server()->Start()); | 631 ASSERT_TRUE(test_server()->Start()); |
| 632 ASSERT_TRUE(https_server_expired_.Start()); | 632 ASSERT_TRUE(https_server_expired_.Start()); |
| (...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1450 | 1450 |
| 1451 // Visit a page over https that contains a frame with a redirect. | 1451 // Visit a page over https that contains a frame with a redirect. |
| 1452 | 1452 |
| 1453 // XMLHttpRequest insecure content in synchronous mode. | 1453 // XMLHttpRequest insecure content in synchronous mode. |
| 1454 | 1454 |
| 1455 // XMLHttpRequest insecure content in asynchronous mode. | 1455 // XMLHttpRequest insecure content in asynchronous mode. |
| 1456 | 1456 |
| 1457 // XMLHttpRequest over bad ssl in synchronous mode. | 1457 // XMLHttpRequest over bad ssl in synchronous mode. |
| 1458 | 1458 |
| 1459 // XMLHttpRequest over OK ssl in synchronous mode. | 1459 // XMLHttpRequest over OK ssl in synchronous mode. |
| OLD | NEW |