Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(8028)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1440303002: Componentize SecurityStateModel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: android/cros fixes Created 5 years, 1 month 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') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 1bdb92194e06aefc82def18a3ed9dd44f7e099d2..9b0a5af1f95f2d395a541c1a8329ad595d5bdcc5 100644
--- a/chrome/browser/ui/website_settings/website_settings_unittest.cc
+++ b/chrome/browser/ui/website_settings/website_settings_unittest.cc
@@ -79,7 +79,7 @@ class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
void SetUp() override {
ChromeRenderViewHostTestHarness::SetUp();
// Setup stub SSLStatus.
- security_info_.security_level = SecurityStateModel::NONE;
+ security_info_.security_level = security_state::NONE;
// Create the certificate.
cert_id_ = 1;
@@ -123,9 +123,7 @@ class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
MockCertStore* cert_store() { return &cert_store_; }
int cert_id() { return cert_id_; }
MockWebsiteSettingsUI* mock_ui() { return mock_ui_.get(); }
- const SecurityStateModel::SecurityInfo& security_info() {
- return security_info_;
- }
+ const security_state::SecurityInfo& security_info() { return security_info_; }
TabSpecificContentSettings* tab_specific_content_settings() {
return TabSpecificContentSettings::FromWebContents(web_contents());
}
@@ -142,7 +140,7 @@ class WebsiteSettingsTest : public ChromeRenderViewHostTestHarness {
return website_settings_.get();
}
- SecurityStateModel::SecurityInfo security_info_;
+ security_state::SecurityInfo security_info_;
private:
scoped_ptr<WebsiteSettings> website_settings_;
@@ -288,7 +286,7 @@ TEST_F(WebsiteSettingsTest, HTTPConnection) {
}
TEST_F(WebsiteSettingsTest, HTTPSConnection) {
- security_info_.security_level = SecurityStateModel::SECURE;
+ security_info_.security_level = security_state::SECURE;
security_info_.scheme_is_cryptographic = true;
security_info_.cert_id = cert_id();
security_info_.cert_status = 0;
@@ -310,13 +308,12 @@ TEST_F(WebsiteSettingsTest, HTTPSConnection) {
}
TEST_F(WebsiteSettingsTest, HTTPSPassiveMixedContent) {
- security_info_.security_level = SecurityStateModel::NONE;
+ security_info_.security_level = security_state::NONE;
security_info_.scheme_is_cryptographic = true;
security_info_.cert_id = cert_id();
security_info_.cert_status = 0;
security_info_.security_bits = 81; // No error if > 80.
- security_info_.mixed_content_status =
- SecurityStateModel::DISPLAYED_MIXED_CONTENT;
+ security_info_.mixed_content_status = security_state::DISPLAYED_MIXED_CONTENT;
int status = 0;
status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);
status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
@@ -336,13 +333,13 @@ TEST_F(WebsiteSettingsTest, HTTPSPassiveMixedContent) {
}
TEST_F(WebsiteSettingsTest, HTTPSActiveMixedContent) {
- security_info_.security_level = SecurityStateModel::SECURITY_ERROR;
+ security_info_.security_level = security_state::SECURITY_ERROR;
security_info_.scheme_is_cryptographic = true;
security_info_.cert_id = cert_id();
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;
+ security_state::RAN_AND_DISPLAYED_MIXED_CONTENT;
int status = 0;
status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);
status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
@@ -370,13 +367,12 @@ TEST_F(WebsiteSettingsTest, HTTPSEVCert) {
EXPECT_CALL(*cert_store(), RetrieveCert(ev_cert_id, _)).WillRepeatedly(
DoAll(SetArgPointee<1>(ev_cert), Return(true)));
- security_info_.security_level = SecurityStateModel::NONE;
+ security_info_.security_level = security_state::NONE;
security_info_.scheme_is_cryptographic = true;
security_info_.cert_id = ev_cert_id;
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;
+ security_info_.mixed_content_status = security_state::DISPLAYED_MIXED_CONTENT;
int status = 0;
status = SetSSLVersion(status, net::SSL_CONNECTION_VERSION_TLS1);
status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
@@ -394,7 +390,7 @@ TEST_F(WebsiteSettingsTest, HTTPSEVCert) {
}
TEST_F(WebsiteSettingsTest, HTTPSRevocationError) {
- security_info_.security_level = SecurityStateModel::SECURE;
+ security_info_.security_level = security_state::SECURE;
security_info_.scheme_is_cryptographic = true;
security_info_.cert_id = cert_id();
security_info_.cert_status = net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION;
@@ -415,7 +411,7 @@ TEST_F(WebsiteSettingsTest, HTTPSRevocationError) {
}
TEST_F(WebsiteSettingsTest, HTTPSConnectionError) {
- security_info_.security_level = SecurityStateModel::SECURE;
+ security_info_.security_level = security_state::SECURE;
security_info_.scheme_is_cryptographic = true;
security_info_.cert_id = cert_id();
security_info_.cert_status = 0;
@@ -436,7 +432,7 @@ TEST_F(WebsiteSettingsTest, HTTPSConnectionError) {
}
TEST_F(WebsiteSettingsTest, HTTPSPolicyCertConnection) {
- security_info_.security_level = SecurityStateModel::SECURITY_POLICY_WARNING;
+ security_info_.security_level = security_state::SECURITY_POLICY_WARNING;
security_info_.scheme_is_cryptographic = true;
security_info_.cert_id = cert_id();
security_info_.cert_status = 0;
@@ -457,7 +453,7 @@ TEST_F(WebsiteSettingsTest, HTTPSPolicyCertConnection) {
}
TEST_F(WebsiteSettingsTest, HTTPSSHA1Minor) {
- security_info_.security_level = SecurityStateModel::NONE;
+ security_info_.security_level = security_state::NONE;
security_info_.scheme_is_cryptographic = true;
security_info_.cert_id = cert_id();
security_info_.cert_status = 0;
@@ -467,7 +463,7 @@ TEST_F(WebsiteSettingsTest, HTTPSSHA1Minor) {
status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
security_info_.connection_status = status;
security_info_.sha1_deprecation_status =
- SecurityStateModel::DEPRECATED_SHA1_MINOR;
+ security_state::DEPRECATED_SHA1_MINOR;
SetDefaultUIExpectations(mock_ui());
EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION));
@@ -484,7 +480,7 @@ TEST_F(WebsiteSettingsTest, HTTPSSHA1Minor) {
}
TEST_F(WebsiteSettingsTest, HTTPSSHA1Major) {
- security_info_.security_level = SecurityStateModel::NONE;
+ security_info_.security_level = security_state::NONE;
security_info_.scheme_is_cryptographic = true;
security_info_.cert_id = cert_id();
security_info_.cert_status = 0;
@@ -494,7 +490,7 @@ TEST_F(WebsiteSettingsTest, HTTPSSHA1Major) {
status = SetSSLCipherSuite(status, CR_TLS_RSA_WITH_AES_256_CBC_SHA256);
security_info_.connection_status = status;
security_info_.sha1_deprecation_status =
- SecurityStateModel::DEPRECATED_SHA1_MAJOR;
+ security_state::DEPRECATED_SHA1_MAJOR;
SetDefaultUIExpectations(mock_ui());
EXPECT_CALL(*mock_ui(), SetSelectedTab(WebsiteSettingsUI::TAB_ID_CONNECTION));
@@ -512,7 +508,7 @@ TEST_F(WebsiteSettingsTest, HTTPSSHA1Major) {
// All SCTs are from unknown logs.
TEST_F(WebsiteSettingsTest, UnknownSCTs) {
- security_info_.security_level = SecurityStateModel::SECURE;
+ security_info_.security_level = security_state::SECURE;
security_info_.scheme_is_cryptographic = true;
security_info_.cert_id = cert_id();
security_info_.cert_status = 0;
@@ -538,7 +534,7 @@ TEST_F(WebsiteSettingsTest, UnknownSCTs) {
// All SCTs are invalid.
TEST_F(WebsiteSettingsTest, InvalidSCTs) {
- security_info_.security_level = SecurityStateModel::SECURE;
+ security_info_.security_level = security_state::SECURE;
security_info_.scheme_is_cryptographic = true;
security_info_.cert_id = cert_id();
security_info_.cert_status = 0;
@@ -564,7 +560,7 @@ TEST_F(WebsiteSettingsTest, InvalidSCTs) {
// All SCTs are valid.
TEST_F(WebsiteSettingsTest, ValidSCTs) {
- security_info_.security_level = SecurityStateModel::SECURE;
+ security_info_.security_level = security_state::SECURE;
security_info_.scheme_is_cryptographic = true;
security_info_.cert_id = cert_id();
security_info_.cert_status = 0;
@@ -598,7 +594,7 @@ TEST_F(WebsiteSettingsTest, ValidSCTsEV) {
EXPECT_CALL(*cert_store(), RetrieveCert(ev_cert_id, _))
.WillRepeatedly(DoAll(SetArgPointee<1>(ev_cert), Return(true)));
- security_info_.security_level = SecurityStateModel::SECURE;
+ security_info_.security_level = security_state::SECURE;
security_info_.scheme_is_cryptographic = true;
security_info_.cert_id = ev_cert_id;
security_info_.cert_status = net::CERT_STATUS_IS_EV;
@@ -625,7 +621,7 @@ TEST_F(WebsiteSettingsTest, ValidSCTsEV) {
// A mix of unknown and invalid SCTs.
TEST_F(WebsiteSettingsTest, UnknownAndInvalidSCTs) {
- security_info_.security_level = SecurityStateModel::SECURE;
+ security_info_.security_level = security_state::SECURE;
security_info_.scheme_is_cryptographic = true;
security_info_.cert_id = cert_id();
security_info_.cert_status = 0;
@@ -651,7 +647,7 @@ TEST_F(WebsiteSettingsTest, UnknownAndInvalidSCTs) {
// At least one SCT is valid and one is from an unknown log.
TEST_F(WebsiteSettingsTest, ValidAndUnknownSCTs) {
- security_info_.security_level = SecurityStateModel::SECURE;
+ security_info_.security_level = security_state::SECURE;
security_info_.scheme_is_cryptographic = true;
security_info_.cert_id = cert_id();
security_info_.cert_status = 0;
« no previous file with comments | « chrome/browser/ui/website_settings/website_settings.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698