| 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/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 1132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1143 // Load again but over SSL. It should be marked as displaying insecure | 1143 // Load again but over SSL. It should be marked as displaying insecure |
| 1144 // content (even though the image comes from the WebCore memory cache). | 1144 // content (even though the image comes from the WebCore memory cache). |
| 1145 const GURL url_https = https_server_.GetURL(replacement_path); | 1145 const GURL url_https = https_server_.GetURL(replacement_path); |
| 1146 ui_test_utils::NavigateToURL(browser(), url_https); | 1146 ui_test_utils::NavigateToURL(browser(), url_https); |
| 1147 CheckAuthenticationBrokenState( | 1147 CheckAuthenticationBrokenState( |
| 1148 tab, | 1148 tab, |
| 1149 CertError::NONE, | 1149 CertError::NONE, |
| 1150 AuthState::DISPLAYED_INSECURE_CONTENT | AuthState::RAN_INSECURE_CONTENT); | 1150 AuthState::DISPLAYED_INSECURE_CONTENT | AuthState::RAN_INSECURE_CONTENT); |
| 1151 } | 1151 } |
| 1152 | 1152 |
| 1153 #if defined(OS_WIN) |
| 1154 // Flaky on Win7 debug (http://crbug.com/368280). |
| 1155 #define MAYBE_TestCNInvalidStickiness DISABLED_TestCNInvalidStickiness |
| 1156 #else |
| 1157 #define MAYBE_TestCNInvalidStickiness TestCNInvalidStickiness |
| 1158 #endif |
| 1153 // This test ensures the CN invalid status does not 'stick' to a certificate | 1159 // This test ensures the CN invalid status does not 'stick' to a certificate |
| 1154 // (see bug #1044942) and that it depends on the host-name. | 1160 // (see bug #1044942) and that it depends on the host-name. |
| 1155 IN_PROC_BROWSER_TEST_F(SSLUITest, TestCNInvalidStickiness) { | 1161 IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestCNInvalidStickiness) { |
| 1156 ASSERT_TRUE(https_server_.Start()); | 1162 ASSERT_TRUE(https_server_.Start()); |
| 1157 ASSERT_TRUE(https_server_mismatched_.Start()); | 1163 ASSERT_TRUE(https_server_mismatched_.Start()); |
| 1158 | 1164 |
| 1159 // First we hit the server with hostname, this generates an invalid policy | 1165 // First we hit the server with hostname, this generates an invalid policy |
| 1160 // error. | 1166 // error. |
| 1161 ui_test_utils::NavigateToURL(browser(), | 1167 ui_test_utils::NavigateToURL(browser(), |
| 1162 https_server_mismatched_.GetURL("files/ssl/google.html")); | 1168 https_server_mismatched_.GetURL("files/ssl/google.html")); |
| 1163 | 1169 |
| 1164 // We get an interstitial page as a result. | 1170 // We get an interstitial page as a result. |
| 1165 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); | 1171 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); |
| (...skipping 582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1748 | 1754 |
| 1749 // Visit a page over https that contains a frame with a redirect. | 1755 // Visit a page over https that contains a frame with a redirect. |
| 1750 | 1756 |
| 1751 // XMLHttpRequest insecure content in synchronous mode. | 1757 // XMLHttpRequest insecure content in synchronous mode. |
| 1752 | 1758 |
| 1753 // XMLHttpRequest insecure content in asynchronous mode. | 1759 // XMLHttpRequest insecure content in asynchronous mode. |
| 1754 | 1760 |
| 1755 // XMLHttpRequest over bad ssl in synchronous mode. | 1761 // XMLHttpRequest over bad ssl in synchronous mode. |
| 1756 | 1762 |
| 1757 // XMLHttpRequest over OK ssl in synchronous mode. | 1763 // XMLHttpRequest over OK ssl in synchronous mode. |
| OLD | NEW |