| 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_dll_resource.h" | 6 #include "chrome/app/chrome_dll_resource.h" |
| 7 #include "chrome/browser/browser.h" | 7 #include "chrome/browser/browser.h" |
| 8 #include "chrome/browser/browser_navigator.h" | 8 #include "chrome/browser/browser_navigator.h" |
| 9 #include "chrome/browser/prefs/pref_service.h" | 9 #include "chrome/browser/prefs/pref_service.h" |
| 10 #include "chrome/browser/profile.h" | 10 #include "chrome/browser/profile.h" |
| (...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 CheckAuthenticatedState(tab, false); | 225 CheckAuthenticatedState(tab, false); |
| 226 | 226 |
| 227 // Try to navigate to a new page. (to make sure bug 5800 is fixed). | 227 // Try to navigate to a new page. (to make sure bug 5800 is fixed). |
| 228 ui_test_utils::NavigateToURL(browser(), | 228 ui_test_utils::NavigateToURL(browser(), |
| 229 test_server()->GetURL("files/ssl/google.html")); | 229 test_server()->GetURL("files/ssl/google.html")); |
| 230 CheckUnauthenticatedState(tab); | 230 CheckUnauthenticatedState(tab); |
| 231 } | 231 } |
| 232 | 232 |
| 233 // Visits a page with https error and then goes back using Browser::GoBack. | 233 // Visits a page with https error and then goes back using Browser::GoBack. |
| 234 #if defined(OS_WIN) | 234 #if defined(OS_WIN) |
| 235 // Disabled on win. Times out. crbug.com/43575 | 235 // Disabled on win. Times out. crbug.com/43575 and crbug.com/61528 |
| 236 #define TestHTTPSExpiredCertAndGoBackViaButton \ | 236 #define TestHTTPSExpiredCertAndGoBackViaButton \ |
| 237 DISABLED_TestHTTPSExpiredCertAndGoBackViaButton | 237 DISABLED_TestHTTPSExpiredCertAndGoBackViaButton |
| 238 #endif | 238 #endif |
| 239 IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndGoBackViaButton) { | 239 IN_PROC_BROWSER_TEST_F(SSLUITest, TestHTTPSExpiredCertAndGoBackViaButton) { |
| 240 ASSERT_TRUE(test_server()->Start()); | 240 ASSERT_TRUE(test_server()->Start()); |
| 241 ASSERT_TRUE(https_server_expired_.Start()); | 241 ASSERT_TRUE(https_server_expired_.Start()); |
| 242 | 242 |
| 243 // First navigate to an HTTP page. | 243 // First navigate to an HTTP page. |
| 244 ui_test_utils::NavigateToURL(browser(), | 244 ui_test_utils::NavigateToURL(browser(), |
| 245 test_server()->GetURL("files/ssl/google.html")); | 245 test_server()->GetURL("files/ssl/google.html")); |
| (...skipping 11 matching lines...) Expand all Loading... |
| 257 browser()->GoBack(CURRENT_TAB); | 257 browser()->GoBack(CURRENT_TAB); |
| 258 | 258 |
| 259 // We should be back at the original good page. | 259 // We should be back at the original good page. |
| 260 EXPECT_FALSE(browser()->GetSelectedTabContents()->interstitial_page()); | 260 EXPECT_FALSE(browser()->GetSelectedTabContents()->interstitial_page()); |
| 261 CheckUnauthenticatedState(tab); | 261 CheckUnauthenticatedState(tab); |
| 262 } | 262 } |
| 263 | 263 |
| 264 // Visits a page with https error and then goes back using GoToOffset. | 264 // Visits a page with https error and then goes back using GoToOffset. |
| 265 // Marked as flaky, see bug 40932. | 265 // Marked as flaky, see bug 40932. |
| 266 #if defined(OS_WIN) | 266 #if defined(OS_WIN) |
| 267 // Disabled on win. Times out. crbug.com/43575 | 267 // Disabled on win. Times out. crbug.com/43575 and crbug.com/61528 |
| 268 #define FLAKY_TestHTTPSExpiredCertAndGoBackViaMenu \ | 268 #define FLAKY_TestHTTPSExpiredCertAndGoBackViaMenu \ |
| 269 DISABLED_TestHTTPSExpiredCertAndGoBackViaMenu | 269 DISABLED_TestHTTPSExpiredCertAndGoBackViaMenu |
| 270 #endif | 270 #endif |
| 271 IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoBackViaMenu) { | 271 IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoBackViaMenu) { |
| 272 ASSERT_TRUE(test_server()->Start()); | 272 ASSERT_TRUE(test_server()->Start()); |
| 273 ASSERT_TRUE(https_server_expired_.Start()); | 273 ASSERT_TRUE(https_server_expired_.Start()); |
| 274 | 274 |
| 275 // First navigate to an HTTP page. | 275 // First navigate to an HTTP page. |
| 276 ui_test_utils::NavigateToURL(browser(), | 276 ui_test_utils::NavigateToURL(browser(), |
| 277 test_server()->GetURL("files/ssl/google.html")); | 277 test_server()->GetURL("files/ssl/google.html")); |
| (...skipping 685 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 963 | 963 |
| 964 // Visit a page over https that contains a frame with a redirect. | 964 // Visit a page over https that contains a frame with a redirect. |
| 965 | 965 |
| 966 // XMLHttpRequest insecure content in synchronous mode. | 966 // XMLHttpRequest insecure content in synchronous mode. |
| 967 | 967 |
| 968 // XMLHttpRequest insecure content in asynchronous mode. | 968 // XMLHttpRequest insecure content in asynchronous mode. |
| 969 | 969 |
| 970 // XMLHttpRequest over bad ssl in synchronous mode. | 970 // XMLHttpRequest over bad ssl in synchronous mode. |
| 971 | 971 |
| 972 // XMLHttpRequest over OK ssl in synchronous mode. | 972 // XMLHttpRequest over OK ssl in synchronous mode. |
| OLD | NEW |