| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/time.h" | 5 #include "base/time.h" |
| 6 #include "chrome/app/chrome_command_ids.h" | 6 #include "chrome/app/chrome_command_ids.h" |
| 7 #include "chrome/browser/tab_contents/interstitial_page.h" | 7 #include "chrome/browser/tab_contents/interstitial_page.h" |
| 8 #include "chrome/browser/tab_contents/navigation_entry.h" | 8 #include "chrome/browser/tab_contents/navigation_entry.h" |
| 9 #include "chrome/browser/tab_contents/tab_contents.h" | 9 #include "chrome/browser/tab_contents/tab_contents.h" |
| 10 #include "chrome/browser/tabs/tab_strip_model.h" | 10 #include "chrome/browser/tabs/tab_strip_model.h" |
| (...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 795 CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, | 795 CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, |
| 796 true); // Interstitial showing. | 796 true); // Interstitial showing. |
| 797 | 797 |
| 798 ProceedThroughInterstitial(tab); | 798 ProceedThroughInterstitial(tab); |
| 799 | 799 |
| 800 CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, | 800 CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, |
| 801 false); // No interstitial showing. | 801 false); // No interstitial showing. |
| 802 } | 802 } |
| 803 | 803 |
| 804 // Visit a page over http that is a redirect to a page with good HTTPS. | 804 // Visit a page over http that is a redirect to a page with good HTTPS. |
| 805 IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectHTTPToGoodHTTPS) { | 805 // Disabled, http://crbug.com/70216. |
| 806 IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestRedirectHTTPToGoodHTTPS) { |
| 806 ASSERT_TRUE(test_server()->Start()); | 807 ASSERT_TRUE(test_server()->Start()); |
| 807 ASSERT_TRUE(https_server_.Start()); | 808 ASSERT_TRUE(https_server_.Start()); |
| 808 | 809 |
| 809 TabContents* tab = browser()->GetSelectedTabContents(); | 810 TabContents* tab = browser()->GetSelectedTabContents(); |
| 810 | 811 |
| 811 // HTTP redirects to good HTTPS. | 812 // HTTP redirects to good HTTPS. |
| 812 GURL http_url = test_server()->GetURL("server-redirect?"); | 813 GURL http_url = test_server()->GetURL("server-redirect?"); |
| 813 GURL good_https_url = | 814 GURL good_https_url = |
| 814 https_server_.GetURL("files/ssl/google.html"); | 815 https_server_.GetURL("files/ssl/google.html"); |
| 815 | 816 |
| (...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1094 | 1095 |
| 1095 // Visit a page over https that contains a frame with a redirect. | 1096 // Visit a page over https that contains a frame with a redirect. |
| 1096 | 1097 |
| 1097 // XMLHttpRequest insecure content in synchronous mode. | 1098 // XMLHttpRequest insecure content in synchronous mode. |
| 1098 | 1099 |
| 1099 // XMLHttpRequest insecure content in asynchronous mode. | 1100 // XMLHttpRequest insecure content in asynchronous mode. |
| 1100 | 1101 |
| 1101 // XMLHttpRequest over bad ssl in synchronous mode. | 1102 // XMLHttpRequest over bad ssl in synchronous mode. |
| 1102 | 1103 |
| 1103 // XMLHttpRequest over OK ssl in synchronous mode. | 1104 // XMLHttpRequest over OK ssl in synchronous mode. |
| OLD | NEW |