| 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/prefs/pref_service.h" | 7 #include "base/prefs/pref_service.h" |
| 8 #include "base/string_util.h" | 8 #include "base/string_util.h" |
| 9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
| 10 #include "base/time.h" | 10 #include "base/time.h" |
| (...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 // Verify our assumption that there was no prior navigation. | 731 // Verify our assumption that there was no prior navigation. |
| 732 EXPECT_FALSE(chrome::CanGoBack(browser())); | 732 EXPECT_FALSE(chrome::CanGoBack(browser())); |
| 733 | 733 |
| 734 // We should have an interstitial page showing. | 734 // We should have an interstitial page showing. |
| 735 ASSERT_TRUE(tab2->GetInterstitialPage()); | 735 ASSERT_TRUE(tab2->GetInterstitialPage()); |
| 736 } | 736 } |
| 737 | 737 |
| 738 IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadHTTPSDownload) { | 738 IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadHTTPSDownload) { |
| 739 ASSERT_TRUE(test_server()->Start()); | 739 ASSERT_TRUE(test_server()->Start()); |
| 740 ASSERT_TRUE(https_server_expired_.Start()); | 740 ASSERT_TRUE(https_server_expired_.Start()); |
| 741 GURL url_non_dangerous = test_server()->GetURL(""); | 741 GURL url_non_dangerous = test_server()->GetURL(std::string()); |
| 742 GURL url_dangerous = https_server_expired_.GetURL( | 742 GURL url_dangerous = |
| 743 "files/downloads/dangerous/dangerous.exe"); | 743 https_server_expired_.GetURL("files/downloads/dangerous/dangerous.exe"); |
| 744 base::ScopedTempDir downloads_directory_; | 744 base::ScopedTempDir downloads_directory_; |
| 745 | 745 |
| 746 // Need empty temp dir to avoid having Chrome ask us for a new filename | 746 // Need empty temp dir to avoid having Chrome ask us for a new filename |
| 747 // when we've downloaded dangerous.exe one hundred times. | 747 // when we've downloaded dangerous.exe one hundred times. |
| 748 ASSERT_TRUE(downloads_directory_.CreateUniqueTempDir()); | 748 ASSERT_TRUE(downloads_directory_.CreateUniqueTempDir()); |
| 749 | 749 |
| 750 browser()->profile()->GetPrefs()->SetFilePath( | 750 browser()->profile()->GetPrefs()->SetFilePath( |
| 751 prefs::kDownloadDefaultDirectory, | 751 prefs::kDownloadDefaultDirectory, |
| 752 downloads_directory_.path()); | 752 downloads_directory_.path()); |
| 753 | 753 |
| (...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1629 | 1629 |
| 1630 // Visit a page over https that contains a frame with a redirect. | 1630 // Visit a page over https that contains a frame with a redirect. |
| 1631 | 1631 |
| 1632 // XMLHttpRequest insecure content in synchronous mode. | 1632 // XMLHttpRequest insecure content in synchronous mode. |
| 1633 | 1633 |
| 1634 // XMLHttpRequest insecure content in asynchronous mode. | 1634 // XMLHttpRequest insecure content in asynchronous mode. |
| 1635 | 1635 |
| 1636 // XMLHttpRequest over bad ssl in synchronous mode. | 1636 // XMLHttpRequest over bad ssl in synchronous mode. |
| 1637 | 1637 |
| 1638 // XMLHttpRequest over OK ssl in synchronous mode. | 1638 // XMLHttpRequest over OK ssl in synchronous mode. |
| OLD | NEW |