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 <utility> | 5 #include <utility> |
6 | 6 |
7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
8 #include "base/bind.h" | 8 #include "base/bind.h" |
9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
(...skipping 924 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
935 browser(), https_server_expired_.GetURL("/ssl/google.html")); | 935 browser(), https_server_expired_.GetURL("/ssl/google.html")); |
936 CheckAuthenticationBrokenState( | 936 CheckAuthenticationBrokenState( |
937 tab, net::CERT_STATUS_DATE_INVALID, AuthState::SHOWING_INTERSTITIAL); | 937 tab, net::CERT_STATUS_DATE_INVALID, AuthState::SHOWING_INTERSTITIAL); |
938 | 938 |
939 ProvisionalLoadWaiter load_failed_observer(tab); | 939 ProvisionalLoadWaiter load_failed_observer(tab); |
940 | 940 |
941 // Simulate user clicking on back button (crbug.com/39248). | 941 // Simulate user clicking on back button (crbug.com/39248). |
942 chrome::GoBack(browser(), CURRENT_TAB); | 942 chrome::GoBack(browser(), CURRENT_TAB); |
943 | 943 |
944 // Wait until we hear the load failure, and make sure we haven't swapped out | 944 // Wait until we hear the load failure, and make sure we haven't swapped out |
945 // the previous page. Prevents regression of http://crbug.com/82667. | 945 // the previous page. Prevents regression of http://crbug.com/82667. |
Charlie Reis
2016/03/14 20:12:57
This comment is a bit stale. Also, maybe we can t
nasko
2016/03/14 21:32:29
Done.
| |
946 // TODO(creis/nick): Move the swapped-out part of this test into content | |
947 // and remove IsRenderViewHostSwappedOut from the public API. | |
948 load_failed_observer.Wait(); | 946 load_failed_observer.Wait(); |
949 EXPECT_FALSE(content::RenderFrameHostTester::IsRenderFrameHostSwappedOut( | |
950 tab->GetMainFrame())); | |
951 | 947 |
952 // We should be back at the original good page. | 948 // We should be back at the original good page. |
953 EXPECT_FALSE(browser()->tab_strip_model()->GetActiveWebContents()-> | 949 EXPECT_FALSE(browser()->tab_strip_model()->GetActiveWebContents()-> |
954 GetInterstitialPage()); | 950 GetInterstitialPage()); |
955 CheckUnauthenticatedState(tab, AuthState::NONE); | 951 CheckUnauthenticatedState(tab, AuthState::NONE); |
956 } | 952 } |
957 | 953 |
958 // Visits a page with https error and then goes back using GoToOffset. | 954 // Visits a page with https error and then goes back using GoToOffset. |
959 // Disabled because its flaky: http://crbug.com/40932, http://crbug.com/43575. | 955 // Disabled because its flaky: http://crbug.com/40932, http://crbug.com/43575. |
960 IN_PROC_BROWSER_TEST_F(SSLUITest, | 956 IN_PROC_BROWSER_TEST_F(SSLUITest, |
(...skipping 2015 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2976 | 2972 |
2977 // Visit a page over https that contains a frame with a redirect. | 2973 // Visit a page over https that contains a frame with a redirect. |
2978 | 2974 |
2979 // XMLHttpRequest insecure content in synchronous mode. | 2975 // XMLHttpRequest insecure content in synchronous mode. |
2980 | 2976 |
2981 // XMLHttpRequest insecure content in asynchronous mode. | 2977 // XMLHttpRequest insecure content in asynchronous mode. |
2982 | 2978 |
2983 // XMLHttpRequest over bad ssl in synchronous mode. | 2979 // XMLHttpRequest over bad ssl in synchronous mode. |
2984 | 2980 |
2985 // XMLHttpRequest over OK ssl in synchronous mode. | 2981 // XMLHttpRequest over OK ssl in synchronous mode. |
OLD | NEW |