OLD | NEW |
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/browser/browser.h" | 6 #include "chrome/browser/browser.h" |
7 #include "chrome/browser/pref_service.h" | 7 #include "chrome/browser/pref_service.h" |
8 #include "chrome/browser/profile.h" | 8 #include "chrome/browser/profile.h" |
9 #include "chrome/browser/tab_contents/interstitial_page.h" | 9 #include "chrome/browser/tab_contents/interstitial_page.h" |
10 #include "chrome/browser/tab_contents/navigation_entry.h" | 10 #include "chrome/browser/tab_contents/navigation_entry.h" |
(...skipping 845 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
856 &success)); | 856 &success)); |
857 EXPECT_TRUE(success); | 857 EXPECT_TRUE(success); |
858 ui_test_utils::WaitForNavigation(&tab->controller()); | 858 ui_test_utils::WaitForNavigation(&tab->controller()); |
859 | 859 |
860 // We should still be authentication broken. | 860 // We should still be authentication broken. |
861 CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false); | 861 CheckAuthenticationBrokenState(tab, net::CERT_STATUS_DATE_INVALID, false); |
862 } | 862 } |
863 | 863 |
864 // From an HTTP top frame, navigate to good and bad HTTPS (security state should | 864 // From an HTTP top frame, navigate to good and bad HTTPS (security state should |
865 // stay unauthenticated). | 865 // stay unauthenticated). |
866 IN_PROC_BROWSER_TEST_F(SSLUITest, TestUnauthenticatedFrameNavigation) { | 866 // Marked as flaky, see bug 40932. |
| 867 IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnauthenticatedFrameNavigation) { |
867 scoped_refptr<HTTPTestServer> http_server = PlainServer(); | 868 scoped_refptr<HTTPTestServer> http_server = PlainServer(); |
868 ASSERT_TRUE(http_server.get() != NULL); | 869 ASSERT_TRUE(http_server.get() != NULL); |
869 scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer(); | 870 scoped_refptr<HTTPSTestServer> good_https_server = GoodCertServer(); |
870 ASSERT_TRUE(good_https_server.get() != NULL); | 871 ASSERT_TRUE(good_https_server.get() != NULL); |
871 scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); | 872 scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); |
872 ASSERT_TRUE(bad_https_server.get() != NULL); | 873 ASSERT_TRUE(bad_https_server.get() != NULL); |
873 | 874 |
874 TabContents* tab = browser()->GetSelectedTabContents(); | 875 TabContents* tab = browser()->GetSelectedTabContents(); |
875 ui_test_utils::NavigateToURL( | 876 ui_test_utils::NavigateToURL( |
876 browser(), | 877 browser(), |
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
960 | 961 |
961 // Visit a page over https that contains a frame with a redirect. | 962 // Visit a page over https that contains a frame with a redirect. |
962 | 963 |
963 // XMLHttpRequest mixed in synchronous mode. | 964 // XMLHttpRequest mixed in synchronous mode. |
964 | 965 |
965 // XMLHttpRequest mixed in asynchronous mode. | 966 // XMLHttpRequest mixed in asynchronous mode. |
966 | 967 |
967 // XMLHttpRequest over bad ssl in synchronous mode. | 968 // XMLHttpRequest over bad ssl in synchronous mode. |
968 | 969 |
969 // XMLHttpRequest over OK ssl in synchronous mode. | 970 // XMLHttpRequest over OK ssl in synchronous mode. |
OLD | NEW |