| 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 681 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 692 GURL http_url = http_server->TestServerPageW(L"server-redirect?"); | 692 GURL http_url = http_server->TestServerPageW(L"server-redirect?"); |
| 693 GURL good_https_url = | 693 GURL good_https_url = |
| 694 good_https_server->TestServerPageW(L"files/ssl/google.html"); | 694 good_https_server->TestServerPageW(L"files/ssl/google.html"); |
| 695 | 695 |
| 696 ui_test_utils::NavigateToURL(browser(), | 696 ui_test_utils::NavigateToURL(browser(), |
| 697 GURL(http_url.spec() + good_https_url.spec())); | 697 GURL(http_url.spec() + good_https_url.spec())); |
| 698 CheckAuthenticatedState(tab, false, false); // No mixed/unsafe content. | 698 CheckAuthenticatedState(tab, false, false); // No mixed/unsafe content. |
| 699 } | 699 } |
| 700 | 700 |
| 701 // Visit a page over http that is a redirect to a page with bad HTTPS. | 701 // Visit a page over http that is a redirect to a page with bad HTTPS. |
| 702 IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectHTTPToBadHTTPS) { | 702 IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectHTTPToBadHTTPS) { |
| 703 scoped_refptr<HTTPTestServer> http_server = PlainServer(); | 703 scoped_refptr<HTTPTestServer> http_server = PlainServer(); |
| 704 ASSERT_TRUE(http_server.get() != NULL); | 704 ASSERT_TRUE(http_server.get() != NULL); |
| 705 scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); | 705 scoped_refptr<HTTPSTestServer> bad_https_server = BadCertServer(); |
| 706 ASSERT_TRUE(bad_https_server.get() != NULL); | 706 ASSERT_TRUE(bad_https_server.get() != NULL); |
| 707 | 707 |
| 708 TabContents* tab = browser()->GetSelectedTabContents(); | 708 TabContents* tab = browser()->GetSelectedTabContents(); |
| 709 | 709 |
| 710 GURL http_url = http_server->TestServerPageW(L"server-redirect?"); | 710 GURL http_url = http_server->TestServerPageW(L"server-redirect?"); |
| 711 GURL bad_https_url = | 711 GURL bad_https_url = |
| 712 bad_https_server->TestServerPageW(L"files/ssl/google.html"); | 712 bad_https_server->TestServerPageW(L"files/ssl/google.html"); |
| (...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 965 | 965 |
| 966 // Visit a page over https that contains a frame with a redirect. | 966 // Visit a page over https that contains a frame with a redirect. |
| 967 | 967 |
| 968 // XMLHttpRequest mixed in synchronous mode. | 968 // XMLHttpRequest mixed in synchronous mode. |
| 969 | 969 |
| 970 // XMLHttpRequest mixed in asynchronous mode. | 970 // XMLHttpRequest mixed in asynchronous mode. |
| 971 | 971 |
| 972 // XMLHttpRequest over bad ssl in synchronous mode. | 972 // XMLHttpRequest over bad ssl in synchronous mode. |
| 973 | 973 |
| 974 // XMLHttpRequest over OK ssl in synchronous mode. | 974 // XMLHttpRequest over OK ssl in synchronous mode. |
| OLD | NEW |