| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/time.h" | 6 #include "base/time.h" |
| 7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
| 8 #include "chrome/browser/tabs/tab_strip_model.h" | 8 #include "chrome/browser/tabs/tab_strip_model.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_navigator.h" | 10 #include "chrome/browser/ui/browser_navigator.h" |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 "files/ssl/page_with_unsafe_contents.html", | 237 "files/ssl/page_with_unsafe_contents.html", |
| 238 https_server_expired_.host_port_pair(), | 238 https_server_expired_.host_port_pair(), |
| 239 &replacement_path)); | 239 &replacement_path)); |
| 240 | 240 |
| 241 ui_test_utils::NavigateToURL( | 241 ui_test_utils::NavigateToURL( |
| 242 browser(), test_server()->GetURL(replacement_path)); | 242 browser(), test_server()->GetURL(replacement_path)); |
| 243 | 243 |
| 244 CheckUnauthenticatedState(browser()->GetSelectedTabContents()); | 244 CheckUnauthenticatedState(browser()->GetSelectedTabContents()); |
| 245 } | 245 } |
| 246 | 246 |
| 247 // http://crbug.com/91745 |
| 248 #if defined(OS_CHROMEOS) |
| 249 #define MAYBE_TestOKHTTPS FLAKY_TestOKHTTPS |
| 250 #else |
| 251 #define MAYBE_TestOKHTTPS TestOKHTTPS |
| 252 #endif |
| 253 |
| 247 // Visits a page over OK https: | 254 // Visits a page over OK https: |
| 248 IN_PROC_BROWSER_TEST_F(SSLUITest, TestOKHTTPS) { | 255 IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestOKHTTPS) { |
| 249 ASSERT_TRUE(https_server_.Start()); | 256 ASSERT_TRUE(https_server_.Start()); |
| 250 | 257 |
| 251 ui_test_utils::NavigateToURL(browser(), | 258 ui_test_utils::NavigateToURL(browser(), |
| 252 https_server_.GetURL("files/ssl/google.html")); | 259 https_server_.GetURL("files/ssl/google.html")); |
| 253 | 260 |
| 254 CheckAuthenticatedState(browser()->GetSelectedTabContents(), false); | 261 CheckAuthenticatedState(browser()->GetSelectedTabContents(), false); |
| 255 } | 262 } |
| 256 | 263 |
| 257 // Visits a page with https error and proceed: | 264 // Visits a page with https error and proceed: |
| 258 // Disabled, http://crbug.com/68448. | 265 // Disabled, http://crbug.com/68448. |
| (...skipping 909 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1168 | 1175 |
| 1169 // Visit a page over https that contains a frame with a redirect. | 1176 // Visit a page over https that contains a frame with a redirect. |
| 1170 | 1177 |
| 1171 // XMLHttpRequest insecure content in synchronous mode. | 1178 // XMLHttpRequest insecure content in synchronous mode. |
| 1172 | 1179 |
| 1173 // XMLHttpRequest insecure content in asynchronous mode. | 1180 // XMLHttpRequest insecure content in asynchronous mode. |
| 1174 | 1181 |
| 1175 // XMLHttpRequest over bad ssl in synchronous mode. | 1182 // XMLHttpRequest over bad ssl in synchronous mode. |
| 1176 | 1183 |
| 1177 // XMLHttpRequest over OK ssl in synchronous mode. | 1184 // XMLHttpRequest over OK ssl in synchronous mode. |
| OLD | NEW |