chrome/browser/ssl/security_state_tab_helper_browser_tests.cc - Issue 2616553002: Remove obsolete SHA-1 UX elements

Unified Diff: chrome/browser/ssl/security_state_tab_helper_browser_tests.cc

Issue 2616553002: Remove obsolete SHA-1 UX elements (Closed)

Patch Set: Fixup WebsiteSettingsTest Created 3 years, 12 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

« no previous file with comments | « chrome/browser/ssl/security_state_tab_helper.cc ('k') | chrome/browser/ui/website_settings/website_settings.h » ('j') | components/security_state/content/content_utils.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ssl/security_state_tab_helper_browser_tests.cc

diff --git a/chrome/browser/ssl/security_state_tab_helper_browser_tests.cc b/chrome/browser/ssl/security_state_tab_helper_browser_tests.cc

index e503b432b484779a2e280c3d7c574c6c5db8ecb0..49ee39897f6994fc6dc63b16c9aa347d8ed1b574 100644

--- a/chrome/browser/ssl/security_state_tab_helper_browser_tests.cc

+++ b/chrome/browser/ssl/security_state_tab_helper_browser_tests.cc

@@ -403,7 +403,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStateTabHelperTest, SHA1Certificate) {

https_server_.GetURL("/ssl/google.html"));

CheckSecurityInfoForSecure(

browser()->tab_strip_model()->GetActiveWebContents(),

- security_state::DANGEROUS, security_state::DEPRECATED_SHA1_MAJOR,

+ security_state::NONE, security_state::DEPRECATED_SHA1,

security_state::CONTENT_STATUS_NONE, false,

false /* expect cert status error */);

}

@@ -609,7 +609,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStateTabHelperTest, MixedContentWithSHA1Cert) {

https_server_.GetURL(replacement_path));

CheckSecurityInfoForSecure(

browser()->tab_strip_model()->GetActiveWebContents(),

- security_state::DANGEROUS, security_state::DEPRECATED_SHA1_MAJOR,

+ security_state::NONE, security_state::DEPRECATED_SHA1,

security_state::CONTENT_STATUS_DISPLAYED, false,

false /* expect cert status error */);

@@ -621,7 +621,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStateTabHelperTest, MixedContentWithSHA1Cert) {

https_server_.GetURL(replacement_path));

CheckSecurityInfoForSecure(

browser()->tab_strip_model()->GetActiveWebContents(),

- security_state::DANGEROUS, security_state::DEPRECATED_SHA1_MAJOR,

+ security_state::NONE, security_state::DEPRECATED_SHA1,

security_state::CONTENT_STATUS_NONE, false,

false /* expect cert status error */);

// Load the insecure image.

@@ -632,7 +632,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStateTabHelperTest, MixedContentWithSHA1Cert) {

EXPECT_TRUE(js_result);

CheckSecurityInfoForSecure(

browser()->tab_strip_model()->GetActiveWebContents(),

- security_state::DANGEROUS, security_state::DEPRECATED_SHA1_MAJOR,

+ security_state::NONE, security_state::DEPRECATED_SHA1,

security_state::CONTENT_STATUS_DISPLAYED, false,

false /* expect cert status error */);

@@ -643,7 +643,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStateTabHelperTest, MixedContentWithSHA1Cert) {

https_server_.GetURL(replacement_path));

CheckSecurityInfoForSecure(

browser()->tab_strip_model()->GetActiveWebContents(),

- security_state::DANGEROUS, security_state::DEPRECATED_SHA1_MAJOR,

+ security_state::DANGEROUS, security_state::DEPRECATED_SHA1,

security_state::CONTENT_STATUS_RAN, false,

false /* expect cert status error */);

@@ -655,7 +655,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStateTabHelperTest, MixedContentWithSHA1Cert) {

https_server_.GetURL(replacement_path));

CheckSecurityInfoForSecure(

browser()->tab_strip_model()->GetActiveWebContents(),

- security_state::DANGEROUS, security_state::DEPRECATED_SHA1_MAJOR,

+ security_state::DANGEROUS, security_state::DEPRECATED_SHA1,

security_state::CONTENT_STATUS_DISPLAYED_AND_RAN, false,

false /* expect cert status error */);

}