| 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 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 https_server_expired_.GetURL("files/ssl/google.html")); | 344 https_server_expired_.GetURL("files/ssl/google.html")); |
| 345 CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, | 345 CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false, |
| 346 true); // Interstitial showing | 346 true); // Interstitial showing |
| 347 | 347 |
| 348 // Simulate user clicking on back button (crbug.com/39248). | 348 // Simulate user clicking on back button (crbug.com/39248). |
| 349 browser()->GoBack(CURRENT_TAB); | 349 browser()->GoBack(CURRENT_TAB); |
| 350 | 350 |
| 351 // Wait until we hear the load failure, and make sure we haven't swapped out | 351 // Wait until we hear the load failure, and make sure we haven't swapped out |
| 352 // the previous page. Prevents regression of http://crbug.com/82667. | 352 // the previous page. Prevents regression of http://crbug.com/82667. |
| 353 ui_test_utils::WaitForNotification( | 353 ui_test_utils::WaitForNotification( |
| 354 NotificationType::FAIL_PROVISIONAL_LOAD_WITH_ERROR); | 354 content::NOTIFICATION_FAIL_PROVISIONAL_LOAD_WITH_ERROR); |
| 355 EXPECT_FALSE(tab->render_view_host()->is_swapped_out()); | 355 EXPECT_FALSE(tab->render_view_host()->is_swapped_out()); |
| 356 | 356 |
| 357 // We should be back at the original good page. | 357 // We should be back at the original good page. |
| 358 EXPECT_FALSE(browser()->GetSelectedTabContents()->interstitial_page()); | 358 EXPECT_FALSE(browser()->GetSelectedTabContents()->interstitial_page()); |
| 359 CheckUnauthenticatedState(tab); | 359 CheckUnauthenticatedState(tab); |
| 360 } | 360 } |
| 361 | 361 |
| 362 // Visits a page with https error and then goes back using GoToOffset. | 362 // Visits a page with https error and then goes back using GoToOffset. |
| 363 // Marked as flaky, see bug 40932. | 363 // Marked as flaky, see bug 40932. |
| 364 IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoBackViaMenu) { | 364 IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestHTTPSExpiredCertAndGoBackViaMenu) { |
| (...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1168 | 1168 |
| 1169 // Visit a page over https that contains a frame with a redirect. | 1169 // Visit a page over https that contains a frame with a redirect. |
| 1170 | 1170 |
| 1171 // XMLHttpRequest insecure content in synchronous mode. | 1171 // XMLHttpRequest insecure content in synchronous mode. |
| 1172 | 1172 |
| 1173 // XMLHttpRequest insecure content in asynchronous mode. | 1173 // XMLHttpRequest insecure content in asynchronous mode. |
| 1174 | 1174 |
| 1175 // XMLHttpRequest over bad ssl in synchronous mode. | 1175 // XMLHttpRequest over bad ssl in synchronous mode. |
| 1176 | 1176 |
| 1177 // XMLHttpRequest over OK ssl in synchronous mode. | 1177 // XMLHttpRequest over OK ssl in synchronous mode. |
| OLD | NEW |