| 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/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/time.h" | 6 #include "base/time.h" |
| 7 #include "chrome/app/chrome_command_ids.h" | 7 #include "chrome/app/chrome_command_ids.h" |
| 8 #include "chrome/browser/tabs/tab_strip_model.h" | 8 #include "chrome/browser/tabs/tab_strip_model.h" |
| 9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
| 10 #include "chrome/browser/ui/browser_navigator.h" | 10 #include "chrome/browser/ui/browser_navigator.h" |
| (...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 728 // Now try again the broken one to make sure it is still broken. | 728 // Now try again the broken one to make sure it is still broken. |
| 729 ui_test_utils::NavigateToURL(browser(), | 729 ui_test_utils::NavigateToURL(browser(), |
| 730 https_server_mismatched_.GetURL("files/ssl/google.html")); | 730 https_server_mismatched_.GetURL("files/ssl/google.html")); |
| 731 | 731 |
| 732 // Since we OKed the interstitial last time, we get right to the page. | 732 // Since we OKed the interstitial last time, we get right to the page. |
| 733 CheckAuthenticationBrokenState(tab, net::CERT_STATUS_COMMON_NAME_INVALID, | 733 CheckAuthenticationBrokenState(tab, net::CERT_STATUS_COMMON_NAME_INVALID, |
| 734 false, false); // No interstitial showing. | 734 false, false); // No interstitial showing. |
| 735 } | 735 } |
| 736 | 736 |
| 737 #if defined(OS_CHROMEOS) | 737 #if defined(OS_CHROMEOS) |
| 738 // This test seems to be flaky on chromiumos. | 738 // This test seems to be flaky and hang on chromiumos. |
| 739 // http://crbug.com/84419 | 739 // http://crbug.com/84419 |
| 740 #define MAYBE_TestRefNavigation FLAKY_TestRefNavigation | 740 #define MAYBE_TestRefNavigation DISABLED_TestRefNavigation |
| 741 #else | 741 #else |
| 742 #define MAYBE_TestRefNavigation TestRefNavigation | 742 #define MAYBE_TestRefNavigation TestRefNavigation |
| 743 #endif | 743 #endif |
| 744 | 744 |
| 745 // Test that navigating to a #ref does not change a bad security state. | 745 // Test that navigating to a #ref does not change a bad security state. |
| 746 IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestRefNavigation) { | 746 IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestRefNavigation) { |
| 747 ASSERT_TRUE(https_server_expired_.Start()); | 747 ASSERT_TRUE(https_server_expired_.Start()); |
| 748 | 748 |
| 749 ui_test_utils::NavigateToURL(browser(), | 749 ui_test_utils::NavigateToURL(browser(), |
| 750 https_server_expired_.GetURL("files/ssl/page_with_refs.html")); | 750 https_server_expired_.GetURL("files/ssl/page_with_refs.html")); |
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1175 | 1175 |
| 1176 // Visit a page over https that contains a frame with a redirect. | 1176 // Visit a page over https that contains a frame with a redirect. |
| 1177 | 1177 |
| 1178 // XMLHttpRequest insecure content in synchronous mode. | 1178 // XMLHttpRequest insecure content in synchronous mode. |
| 1179 | 1179 |
| 1180 // XMLHttpRequest insecure content in asynchronous mode. | 1180 // XMLHttpRequest insecure content in asynchronous mode. |
| 1181 | 1181 |
| 1182 // XMLHttpRequest over bad ssl in synchronous mode. | 1182 // XMLHttpRequest over bad ssl in synchronous mode. |
| 1183 | 1183 |
| 1184 // XMLHttpRequest over OK ssl in synchronous mode. | 1184 // XMLHttpRequest over OK ssl in synchronous mode. |
| OLD | NEW |