chrome/browser/ui/website_settings/website_settings_unittest.cc - Issue 2224193003: Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/website_settings/website_settings_unittest.cc

Issue 2224193003: Rename SecurityStateModel::MIXED_CONTENT_STATUS enum values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 4 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

Download patch

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

Index: chrome/browser/ui/website_settings/website_settings_unittest.cc

diff --git a/chrome/browser/ui/website_settings/website_settings_unittest.cc b/chrome/browser/ui/website_settings/website_settings_unittest.cc

index 6c38587b6a97969f704ee6b1008f699347480968..baf675afe2669801c3521bca2e7cba51f219affa 100644

--- a/chrome/browser/ui/website_settings/website_settings_unittest.cc

+++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc

@@ -385,7 +385,7 @@ TEST_F(WebsiteSettingsTest, HTTPSPassiveMixedContent) {

security_info_.cert_status = 0;

security_info_.security_bits = 81; // No error if > 80.

security_info_.mixed_content_status =

- SecurityStateModel::DISPLAYED_MIXED_CONTENT;

+ SecurityStateModel::CONTENT_STATUS_DISPLAYED;

int status = 0;

status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);

status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);

@@ -411,7 +411,7 @@ TEST_F(WebsiteSettingsTest, HTTPSActiveMixedContent) {

security_info_.cert_status = 0;

security_info_.security_bits = 81; // No error if > 80.

security_info_.mixed_content_status =

- SecurityStateModel::RAN_AND_DISPLAYED_MIXED_CONTENT;

+ SecurityStateModel::CONTENT_STATUS_DISPLAYED_AND_RAN;

int status = 0;

status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);

status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);

@@ -445,7 +445,7 @@ TEST_F(WebsiteSettingsTest, HTTPSEVCert) {

security_info_.cert_status = net::CERT_STATUS_IS_EV;

security_info_.security_bits = 81; // No error if > 80.

security_info_.mixed_content_status =

- SecurityStateModel::DISPLAYED_MIXED_CONTENT;

+ SecurityStateModel::CONTENT_STATUS_DISPLAYED;

int status = 0;

status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);

status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);