| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/app/chrome_command_ids.h" | 6 #include "chrome/app/chrome_command_ids.h" |
| 7 #include "chrome/browser/tabs/tab_strip_model.h" | 7 #include "chrome/browser/tabs/tab_strip_model.h" |
| 8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
| 9 #include "chrome/browser/ui/browser_navigator.h" | 9 #include "chrome/browser/ui/browser_navigator.h" |
| 10 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 10 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
| (...skipping 742 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 753 GURL url = test_server()->GetURL("files/ssl/google.html"); | 753 GURL url = test_server()->GetURL("files/ssl/google.html"); |
| 754 TabContentsWrapper* tab2 = | 754 TabContentsWrapper* tab2 = |
| 755 browser()->AddSelectedTabWithURL(url, PageTransition::TYPED); | 755 browser()->AddSelectedTabWithURL(url, PageTransition::TYPED); |
| 756 ui_test_utils::WaitForNavigation(&(tab2->controller())); | 756 ui_test_utils::WaitForNavigation(&(tab2->controller())); |
| 757 | 757 |
| 758 // Close the first tab. | 758 // Close the first tab. |
| 759 browser()->CloseTabContents(tab1); | 759 browser()->CloseTabContents(tab1); |
| 760 } | 760 } |
| 761 | 761 |
| 762 // Visit a page over bad https that is a redirect to a page with good https. | 762 // Visit a page over bad https that is a redirect to a page with good https. |
| 763 // Marked as flaky, see bug 40932. | 763 // Crashes: http://crbug.com/77374 |
| 764 IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectBadToGoodHTTPS) { | 764 // Previously marked as flaky: http://crbug.com/40932 |
| 765 IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestRedirectBadToGoodHTTPS) { |
| 765 ASSERT_TRUE(https_server_.Start()); | 766 ASSERT_TRUE(https_server_.Start()); |
| 766 ASSERT_TRUE(https_server_expired_.Start()); | 767 ASSERT_TRUE(https_server_expired_.Start()); |
| 767 | 768 |
| 768 GURL url1 = https_server_expired_.GetURL("server-redirect?"); | 769 GURL url1 = https_server_expired_.GetURL("server-redirect?"); |
| 769 GURL url2 = https_server_.GetURL("files/ssl/google.html"); | 770 GURL url2 = https_server_.GetURL("files/ssl/google.html"); |
| 770 | 771 |
| 771 ui_test_utils::NavigateToURL(browser(), GURL(url1.spec() + url2.spec())); | 772 ui_test_utils::NavigateToURL(browser(), GURL(url1.spec() + url2.spec())); |
| 772 | 773 |
| 773 TabContents* tab = browser()->GetSelectedTabContents(); | 774 TabContents* tab = browser()->GetSelectedTabContents(); |
| 774 | 775 |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1095 | 1096 |
| 1096 // Visit a page over https that contains a frame with a redirect. | 1097 // Visit a page over https that contains a frame with a redirect. |
| 1097 | 1098 |
| 1098 // XMLHttpRequest insecure content in synchronous mode. | 1099 // XMLHttpRequest insecure content in synchronous mode. |
| 1099 | 1100 |
| 1100 // XMLHttpRequest insecure content in asynchronous mode. | 1101 // XMLHttpRequest insecure content in asynchronous mode. |
| 1101 | 1102 |
| 1102 // XMLHttpRequest over bad ssl in synchronous mode. | 1103 // XMLHttpRequest over bad ssl in synchronous mode. |
| 1103 | 1104 |
| 1104 // XMLHttpRequest over OK ssl in synchronous mode. | 1105 // XMLHttpRequest over OK ssl in synchronous mode. |
| OLD | NEW |