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

Unified Diff: components/security_state/security_state_model.cc

Issue 2327433002: Stop using CertStore which is not compatible with PlzNavigate. (Closed)
Patch Set: remove certstore on non-ios and update plznavigate test filter Created 4 years, 3 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
Index: components/security_state/security_state_model.cc
diff --git a/components/security_state/security_state_model.cc b/components/security_state/security_state_model.cc
index 6639d48f7de17589286d03741d32db7fe5f05ddf..960446d637d4a1ae030baf9c4beef7581f031b26 100644
--- a/components/security_state/security_state_model.cc
+++ b/components/security_state/security_state_model.cc
@@ -195,7 +195,7 @@ void SecurityInfoForRequest(
}
return;
}
- security_info->cert_id = visible_security_state.cert_id;
+ security_info->certificate = visible_security_state.certificate;
security_info->sha1_deprecation_status =
GetSHA1DeprecationStatus(cert, visible_security_state);
security_info->mixed_content_status =
@@ -242,7 +242,6 @@ SecurityStateModel::SecurityInfo::SecurityInfo()
content_with_cert_errors_status(SecurityStateModel::CONTENT_STATUS_NONE),
scheme_is_cryptographic(false),
cert_status(0),
- cert_id(0),
security_bits(-1),
connection_status(0),
obsolete_ssl_status(net::OBSOLETE_SSL_NONE),
@@ -288,7 +287,6 @@ SecurityStateModel::VisibleSecurityState::VisibleSecurityState()
: initial_security_level(SecurityStateModel::NONE),
fails_malware_check(false),
connection_info_initialized(false),
- cert_id(0),
cert_status(0),
connection_status(0),
security_bits(-1),
@@ -305,7 +303,9 @@ bool SecurityStateModel::VisibleSecurityState::operator==(
return (url == other.url &&
initial_security_level == other.initial_security_level &&
fails_malware_check == other.fails_malware_check &&
- cert_id == other.cert_id && cert_status == other.cert_status &&
+ !!certificate.get() == !!other.certificate.get() &&
+ (certificate.get() ? certificate->Equals(other.certificate.get()) :
+ true) &&
connection_status == other.connection_status &&
security_bits == other.security_bits &&
sct_verify_statuses == other.sct_verify_statuses &&

Powered by Google App Engine
This is Rietveld 408576698