| 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "base/strings/string_util.h" | 10 #include "base/strings/string_util.h" |
| (...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 553 CheckAuthenticationBrokenState( | 553 CheckAuthenticationBrokenState( |
| 554 tab, net::CERT_STATUS_DATE_INVALID, AuthState::SHOWING_INTERSTITIAL); | 554 tab, net::CERT_STATUS_DATE_INVALID, AuthState::SHOWING_INTERSTITIAL); |
| 555 | 555 |
| 556 ProvisionalLoadWaiter load_failed_observer(tab); | 556 ProvisionalLoadWaiter load_failed_observer(tab); |
| 557 | 557 |
| 558 // Simulate user clicking on back button (crbug.com/39248). | 558 // Simulate user clicking on back button (crbug.com/39248). |
| 559 chrome::GoBack(browser(), CURRENT_TAB); | 559 chrome::GoBack(browser(), CURRENT_TAB); |
| 560 | 560 |
| 561 // Wait until we hear the load failure, and make sure we haven't swapped out | 561 // Wait until we hear the load failure, and make sure we haven't swapped out |
| 562 // the previous page. Prevents regression of http://crbug.com/82667. | 562 // the previous page. Prevents regression of http://crbug.com/82667. |
| 563 // TODO(creis/nick): Move the swapped-out part of this test into content |
| 564 // and remove IsRenderViewHostSwappedOut from the public API. |
| 563 load_failed_observer.Wait(); | 565 load_failed_observer.Wait(); |
| 564 EXPECT_FALSE(content::RenderViewHostTester::IsRenderViewHostSwappedOut( | 566 EXPECT_FALSE(content::RenderViewHostTester::IsRenderViewHostSwappedOut( |
| 565 tab->GetRenderViewHost())); | 567 tab->GetRenderViewHost())); |
| 566 | 568 |
| 567 // We should be back at the original good page. | 569 // We should be back at the original good page. |
| 568 EXPECT_FALSE(browser()->tab_strip_model()->GetActiveWebContents()-> | 570 EXPECT_FALSE(browser()->tab_strip_model()->GetActiveWebContents()-> |
| 569 GetInterstitialPage()); | 571 GetInterstitialPage()); |
| 570 CheckUnauthenticatedState(tab, AuthState::NONE); | 572 CheckUnauthenticatedState(tab, AuthState::NONE); |
| 571 } | 573 } |
| 572 | 574 |
| (...skipping 1305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1878 | 1880 |
| 1879 // Visit a page over https that contains a frame with a redirect. | 1881 // Visit a page over https that contains a frame with a redirect. |
| 1880 | 1882 |
| 1881 // XMLHttpRequest insecure content in synchronous mode. | 1883 // XMLHttpRequest insecure content in synchronous mode. |
| 1882 | 1884 |
| 1883 // XMLHttpRequest insecure content in asynchronous mode. | 1885 // XMLHttpRequest insecure content in asynchronous mode. |
| 1884 | 1886 |
| 1885 // XMLHttpRequest over bad ssl in synchronous mode. | 1887 // XMLHttpRequest over bad ssl in synchronous mode. |
| 1886 | 1888 |
| 1887 // XMLHttpRequest over OK ssl in synchronous mode. | 1889 // XMLHttpRequest over OK ssl in synchronous mode. |
| OLD | NEW |