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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/bind_helpers.h" | 6 #include "base/bind_helpers.h" |
7 #include "base/callback.h" | 7 #include "base/callback.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/location.h" | 9 #include "base/location.h" |
10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 #include "chrome/browser/interstitials/security_interstitial_page_test_utils.h" | 22 #include "chrome/browser/interstitials/security_interstitial_page_test_utils.h" |
23 #include "chrome/browser/net/certificate_error_reporter.h" | 23 #include "chrome/browser/net/certificate_error_reporter.h" |
24 #include "chrome/browser/profiles/profile.h" | 24 #include "chrome/browser/profiles/profile.h" |
25 #include "chrome/browser/ssl/cert_logger.pb.h" | 25 #include "chrome/browser/ssl/cert_logger.pb.h" |
26 #include "chrome/browser/ssl/cert_report_helper.h" | 26 #include "chrome/browser/ssl/cert_report_helper.h" |
27 #include "chrome/browser/ssl/cert_verifier_browser_test.h" | 27 #include "chrome/browser/ssl/cert_verifier_browser_test.h" |
28 #include "chrome/browser/ssl/certificate_error_report.h" | 28 #include "chrome/browser/ssl/certificate_error_report.h" |
29 #include "chrome/browser/ssl/certificate_reporting_test_utils.h" | 29 #include "chrome/browser/ssl/certificate_reporting_test_utils.h" |
30 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h" | 30 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h" |
31 #include "chrome/browser/ssl/common_name_mismatch_handler.h" | 31 #include "chrome/browser/ssl/common_name_mismatch_handler.h" |
32 #include "chrome/browser/ssl/connection_security.h" | 32 #include "chrome/browser/ssl/security_state_model.h" |
33 #include "chrome/browser/ssl/ssl_blocking_page.h" | 33 #include "chrome/browser/ssl/ssl_blocking_page.h" |
34 #include "chrome/browser/ssl/ssl_error_handler.h" | 34 #include "chrome/browser/ssl/ssl_error_handler.h" |
35 #include "chrome/browser/ui/browser.h" | 35 #include "chrome/browser/ui/browser.h" |
36 #include "chrome/browser/ui/browser_commands.h" | 36 #include "chrome/browser/ui/browser_commands.h" |
37 #include "chrome/browser/ui/browser_navigator.h" | 37 #include "chrome/browser/ui/browser_navigator.h" |
38 #include "chrome/browser/ui/browser_tabstrip.h" | 38 #include "chrome/browser/ui/browser_tabstrip.h" |
39 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 39 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
40 #include "chrome/common/chrome_paths.h" | 40 #include "chrome/common/chrome_paths.h" |
41 #include "chrome/common/chrome_switches.h" | 41 #include "chrome/common/chrome_switches.h" |
42 #include "chrome/common/pref_names.h" | 42 #include "chrome/common/pref_names.h" |
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
977 EXPECT_TRUE(base::LowerCaseEqualsASCII(result, "pass")); | 977 EXPECT_TRUE(base::LowerCaseEqualsASCII(result, "pass")); |
978 } | 978 } |
979 | 979 |
980 // Ensure that non-standard origins are marked correctly when the | 980 // Ensure that non-standard origins are marked correctly when the |
981 // MarkNonSecureAs field trial is enabled. | 981 // MarkNonSecureAs field trial is enabled. |
982 IN_PROC_BROWSER_TEST_F(SSLUITest, TestMarkNonSecureAs) { | 982 IN_PROC_BROWSER_TEST_F(SSLUITest, TestMarkNonSecureAs) { |
983 scoped_refptr<base::FieldTrial> trial = | 983 scoped_refptr<base::FieldTrial> trial = |
984 base::FieldTrialList::CreateFieldTrial( | 984 base::FieldTrialList::CreateFieldTrial( |
985 "MarkNonSecureAs", switches::kMarkNonSecureAsNonSecure); | 985 "MarkNonSecureAs", switches::kMarkNonSecureAsNonSecure); |
986 | 986 |
| 987 content::WebContents* contents = |
| 988 browser()->tab_strip_model()->GetActiveWebContents(); |
| 989 ASSERT_TRUE(contents); |
| 990 |
| 991 SecurityStateModel* model = SecurityStateModel::FromWebContents(contents); |
| 992 ASSERT_TRUE(model); |
| 993 |
987 ui_test_utils::NavigateToURL(browser(), GURL("file:/")); | 994 ui_test_utils::NavigateToURL(browser(), GURL("file:/")); |
988 EXPECT_EQ(connection_security::NONE, | 995 EXPECT_EQ(SecurityStateModel::NONE, model->security_info().security_level); |
989 connection_security::GetSecurityLevelForWebContents( | |
990 browser()->tab_strip_model()->GetActiveWebContents())); | |
991 | 996 |
992 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); | 997 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); |
993 EXPECT_EQ(connection_security::NONE, | 998 EXPECT_EQ(SecurityStateModel::NONE, model->security_info().security_level); |
994 connection_security::GetSecurityLevelForWebContents( | |
995 browser()->tab_strip_model()->GetActiveWebContents())); | |
996 | 999 |
997 ui_test_utils::NavigateToURL(browser(), GURL("data:text/plain,hello")); | 1000 ui_test_utils::NavigateToURL(browser(), GURL("data:text/plain,hello")); |
998 EXPECT_EQ(connection_security::NONE, | 1001 EXPECT_EQ(SecurityStateModel::NONE, model->security_info().security_level); |
999 connection_security::GetSecurityLevelForWebContents( | |
1000 browser()->tab_strip_model()->GetActiveWebContents())); | |
1001 | 1002 |
1002 ui_test_utils::NavigateToURL( | 1003 ui_test_utils::NavigateToURL( |
1003 browser(), | 1004 browser(), |
1004 GURL("blob:chrome%3A//newtab/49a463bb-fac8-476c-97bf-5d7076c3ea1a")); | 1005 GURL("blob:chrome%3A//newtab/49a463bb-fac8-476c-97bf-5d7076c3ea1a")); |
1005 EXPECT_EQ(connection_security::NONE, | 1006 EXPECT_EQ(SecurityStateModel::NONE, model->security_info().security_level); |
1006 connection_security::GetSecurityLevelForWebContents( | |
1007 browser()->tab_strip_model()->GetActiveWebContents())); | |
1008 } | 1007 } |
1009 | 1008 |
1010 #if defined(USE_NSS_CERTS) | 1009 #if defined(USE_NSS_CERTS) |
1011 class SSLUITestWithClientCert : public SSLUITest { | 1010 class SSLUITestWithClientCert : public SSLUITest { |
1012 public: | 1011 public: |
1013 SSLUITestWithClientCert() : cert_db_(NULL) {} | 1012 SSLUITestWithClientCert() : cert_db_(NULL) {} |
1014 | 1013 |
1015 void SetUpOnMainThread() override { | 1014 void SetUpOnMainThread() override { |
1016 SSLUITest::SetUpOnMainThread(); | 1015 SSLUITest::SetUpOnMainThread(); |
1017 | 1016 |
(...skipping 1698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2716 | 2715 |
2717 // Visit a page over https that contains a frame with a redirect. | 2716 // Visit a page over https that contains a frame with a redirect. |
2718 | 2717 |
2719 // XMLHttpRequest insecure content in synchronous mode. | 2718 // XMLHttpRequest insecure content in synchronous mode. |
2720 | 2719 |
2721 // XMLHttpRequest insecure content in asynchronous mode. | 2720 // XMLHttpRequest insecure content in asynchronous mode. |
2722 | 2721 |
2723 // XMLHttpRequest over bad ssl in synchronous mode. | 2722 // XMLHttpRequest over bad ssl in synchronous mode. |
2724 | 2723 |
2725 // XMLHttpRequest over OK ssl in synchronous mode. | 2724 // XMLHttpRequest over OK ssl in synchronous mode. |
OLD | NEW |