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 13 matching lines...) Expand all Loading... |
24 #include "chrome/browser/net/certificate_error_reporter.h" | 24 #include "chrome/browser/net/certificate_error_reporter.h" |
25 #include "chrome/browser/profiles/profile.h" | 25 #include "chrome/browser/profiles/profile.h" |
26 #include "chrome/browser/ssl/bad_clock_blocking_page.h" | 26 #include "chrome/browser/ssl/bad_clock_blocking_page.h" |
27 #include "chrome/browser/ssl/cert_logger.pb.h" | 27 #include "chrome/browser/ssl/cert_logger.pb.h" |
28 #include "chrome/browser/ssl/cert_report_helper.h" | 28 #include "chrome/browser/ssl/cert_report_helper.h" |
29 #include "chrome/browser/ssl/cert_verifier_browser_test.h" | 29 #include "chrome/browser/ssl/cert_verifier_browser_test.h" |
30 #include "chrome/browser/ssl/certificate_error_report.h" | 30 #include "chrome/browser/ssl/certificate_error_report.h" |
31 #include "chrome/browser/ssl/certificate_reporting_test_utils.h" | 31 #include "chrome/browser/ssl/certificate_reporting_test_utils.h" |
32 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h" | 32 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h" |
33 #include "chrome/browser/ssl/common_name_mismatch_handler.h" | 33 #include "chrome/browser/ssl/common_name_mismatch_handler.h" |
34 #include "chrome/browser/ssl/connection_security.h" | 34 #include "chrome/browser/ssl/security_state_model.h" |
35 #include "chrome/browser/ssl/ssl_blocking_page.h" | 35 #include "chrome/browser/ssl/ssl_blocking_page.h" |
36 #include "chrome/browser/ssl/ssl_error_classification.h" | 36 #include "chrome/browser/ssl/ssl_error_classification.h" |
37 #include "chrome/browser/ssl/ssl_error_handler.h" | 37 #include "chrome/browser/ssl/ssl_error_handler.h" |
38 #include "chrome/browser/ui/browser.h" | 38 #include "chrome/browser/ui/browser.h" |
39 #include "chrome/browser/ui/browser_commands.h" | 39 #include "chrome/browser/ui/browser_commands.h" |
40 #include "chrome/browser/ui/browser_navigator.h" | 40 #include "chrome/browser/ui/browser_navigator.h" |
41 #include "chrome/browser/ui/browser_tabstrip.h" | 41 #include "chrome/browser/ui/browser_tabstrip.h" |
42 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 42 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
43 #include "chrome/common/chrome_paths.h" | 43 #include "chrome/common/chrome_paths.h" |
44 #include "chrome/common/chrome_switches.h" | 44 #include "chrome/common/chrome_switches.h" |
(...skipping 955 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1000 EXPECT_TRUE(base::LowerCaseEqualsASCII(result, "pass")); | 1000 EXPECT_TRUE(base::LowerCaseEqualsASCII(result, "pass")); |
1001 } | 1001 } |
1002 | 1002 |
1003 // Ensure that non-standard origins are marked correctly when the | 1003 // Ensure that non-standard origins are marked correctly when the |
1004 // MarkNonSecureAs field trial is enabled. | 1004 // MarkNonSecureAs field trial is enabled. |
1005 IN_PROC_BROWSER_TEST_F(SSLUITest, TestMarkNonSecureAs) { | 1005 IN_PROC_BROWSER_TEST_F(SSLUITest, TestMarkNonSecureAs) { |
1006 scoped_refptr<base::FieldTrial> trial = | 1006 scoped_refptr<base::FieldTrial> trial = |
1007 base::FieldTrialList::CreateFieldTrial( | 1007 base::FieldTrialList::CreateFieldTrial( |
1008 "MarkNonSecureAs", switches::kMarkNonSecureAsNonSecure); | 1008 "MarkNonSecureAs", switches::kMarkNonSecureAsNonSecure); |
1009 | 1009 |
| 1010 content::WebContents* contents = |
| 1011 browser()->tab_strip_model()->GetActiveWebContents(); |
| 1012 ASSERT_TRUE(contents); |
| 1013 |
| 1014 SecurityStateModel* model = SecurityStateModel::FromWebContents(contents); |
| 1015 ASSERT_TRUE(model); |
| 1016 |
1010 ui_test_utils::NavigateToURL(browser(), GURL("file:/")); | 1017 ui_test_utils::NavigateToURL(browser(), GURL("file:/")); |
1011 EXPECT_EQ(connection_security::NONE, | 1018 EXPECT_EQ(SecurityStateModel::NONE, model->security_info().security_level); |
1012 connection_security::GetSecurityLevelForWebContents( | |
1013 browser()->tab_strip_model()->GetActiveWebContents())); | |
1014 | 1019 |
1015 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); | 1020 ui_test_utils::NavigateToURL(browser(), GURL("about:blank")); |
1016 EXPECT_EQ(connection_security::NONE, | 1021 EXPECT_EQ(SecurityStateModel::NONE, model->security_info().security_level); |
1017 connection_security::GetSecurityLevelForWebContents( | |
1018 browser()->tab_strip_model()->GetActiveWebContents())); | |
1019 | 1022 |
1020 ui_test_utils::NavigateToURL(browser(), GURL("data:text/plain,hello")); | 1023 ui_test_utils::NavigateToURL(browser(), GURL("data:text/plain,hello")); |
1021 EXPECT_EQ(connection_security::NONE, | 1024 EXPECT_EQ(SecurityStateModel::NONE, model->security_info().security_level); |
1022 connection_security::GetSecurityLevelForWebContents( | |
1023 browser()->tab_strip_model()->GetActiveWebContents())); | |
1024 | 1025 |
1025 ui_test_utils::NavigateToURL( | 1026 ui_test_utils::NavigateToURL( |
1026 browser(), | 1027 browser(), |
1027 GURL("blob:chrome%3A//newtab/49a463bb-fac8-476c-97bf-5d7076c3ea1a")); | 1028 GURL("blob:chrome%3A//newtab/49a463bb-fac8-476c-97bf-5d7076c3ea1a")); |
1028 EXPECT_EQ(connection_security::NONE, | 1029 EXPECT_EQ(SecurityStateModel::NONE, model->security_info().security_level); |
1029 connection_security::GetSecurityLevelForWebContents( | |
1030 browser()->tab_strip_model()->GetActiveWebContents())); | |
1031 } | 1030 } |
1032 | 1031 |
1033 #if defined(USE_NSS_CERTS) | 1032 #if defined(USE_NSS_CERTS) |
1034 class SSLUITestWithClientCert : public SSLUITest { | 1033 class SSLUITestWithClientCert : public SSLUITest { |
1035 public: | 1034 public: |
1036 SSLUITestWithClientCert() : cert_db_(NULL) {} | 1035 SSLUITestWithClientCert() : cert_db_(NULL) {} |
1037 | 1036 |
1038 void SetUpOnMainThread() override { | 1037 void SetUpOnMainThread() override { |
1039 SSLUITest::SetUpOnMainThread(); | 1038 SSLUITest::SetUpOnMainThread(); |
1040 | 1039 |
(...skipping 1698 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2739 | 2738 |
2740 // Visit a page over https that contains a frame with a redirect. | 2739 // Visit a page over https that contains a frame with a redirect. |
2741 | 2740 |
2742 // XMLHttpRequest insecure content in synchronous mode. | 2741 // XMLHttpRequest insecure content in synchronous mode. |
2743 | 2742 |
2744 // XMLHttpRequest insecure content in asynchronous mode. | 2743 // XMLHttpRequest insecure content in asynchronous mode. |
2745 | 2744 |
2746 // XMLHttpRequest over bad ssl in synchronous mode. | 2745 // XMLHttpRequest over bad ssl in synchronous mode. |
2747 | 2746 |
2748 // XMLHttpRequest over OK ssl in synchronous mode. | 2747 // XMLHttpRequest over OK ssl in synchronous mode. |
OLD | NEW |