| 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/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 373 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 384 ui_test_utils::WindowedNotificationObserver load_failed_observer( | 384 ui_test_utils::WindowedNotificationObserver load_failed_observer( |
| 385 content::NOTIFICATION_FAIL_PROVISIONAL_LOAD_WITH_ERROR, | 385 content::NOTIFICATION_FAIL_PROVISIONAL_LOAD_WITH_ERROR, |
| 386 content::NotificationService::AllSources()); | 386 content::NotificationService::AllSources()); |
| 387 | 387 |
| 388 // Simulate user clicking on back button (crbug.com/39248). | 388 // Simulate user clicking on back button (crbug.com/39248). |
| 389 browser()->GoBack(CURRENT_TAB); | 389 browser()->GoBack(CURRENT_TAB); |
| 390 | 390 |
| 391 // Wait until we hear the load failure, and make sure we haven't swapped out | 391 // Wait until we hear the load failure, and make sure we haven't swapped out |
| 392 // the previous page. Prevents regression of http://crbug.com/82667. | 392 // the previous page. Prevents regression of http://crbug.com/82667. |
| 393 load_failed_observer.Wait(); | 393 load_failed_observer.Wait(); |
| 394 EXPECT_FALSE(TestRenderViewHost::IsRenderViewHostSwappedOut( | 394 EXPECT_FALSE(content::TestRenderViewHost::IsRenderViewHostSwappedOut( |
| 395 tab->GetRenderViewHost())); | 395 tab->GetRenderViewHost())); |
| 396 | 396 |
| 397 // We should be back at the original good page. | 397 // We should be back at the original good page. |
| 398 EXPECT_FALSE(browser()->GetSelectedWebContents()->GetInterstitialPage()); | 398 EXPECT_FALSE(browser()->GetSelectedWebContents()->GetInterstitialPage()); |
| 399 CheckUnauthenticatedState(tab); | 399 CheckUnauthenticatedState(tab); |
| 400 } | 400 } |
| 401 | 401 |
| 402 // Visits a page with https error and then goes back using GoToOffset. | 402 // Visits a page with https error and then goes back using GoToOffset. |
| 403 // Disabled because its flaky: http://crbug.com/40932, http://crbug.com/43575. | 403 // Disabled because its flaky: http://crbug.com/40932, http://crbug.com/43575. |
| 404 IN_PROC_BROWSER_TEST_F(SSLUITest, | 404 IN_PROC_BROWSER_TEST_F(SSLUITest, |
| (...skipping 925 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1330 | 1330 |
| 1331 // Visit a page over https that contains a frame with a redirect. | 1331 // Visit a page over https that contains a frame with a redirect. |
| 1332 | 1332 |
| 1333 // XMLHttpRequest insecure content in synchronous mode. | 1333 // XMLHttpRequest insecure content in synchronous mode. |
| 1334 | 1334 |
| 1335 // XMLHttpRequest insecure content in asynchronous mode. | 1335 // XMLHttpRequest insecure content in asynchronous mode. |
| 1336 | 1336 |
| 1337 // XMLHttpRequest over bad ssl in synchronous mode. | 1337 // XMLHttpRequest over bad ssl in synchronous mode. |
| 1338 | 1338 |
| 1339 // XMLHttpRequest over OK ssl in synchronous mode. | 1339 // XMLHttpRequest over OK ssl in synchronous mode. |
| OLD | NEW |