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

Unified Diff: content/public/common/ssl_status.h

Issue 2327433002: Stop using CertStore which is not compatible with PlzNavigate. (Closed)
Patch Set: remove cert_store on ios 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
« no previous file with comments | « content/public/common/common_param_traits_macros.h ('k') | content/public/common/ssl_status.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/common/ssl_status.h
diff --git a/content/public/common/ssl_status.h b/content/public/common/ssl_status.h
index bd500647c169c60750fa5364dc1881139135c5ee..c9ada0f8942446002225c03e707619b150520c44 100644
--- a/content/public/common/ssl_status.h
+++ b/content/public/common/ssl_status.h
@@ -11,6 +11,7 @@
#include "content/public/common/security_style.h"
#include "net/cert/cert_status_flags.h"
#include "net/cert/sct_status_flags.h"
+#include "net/cert/x509_certificate.h"
namespace net {
class SSLInfo;
@@ -42,14 +43,17 @@ struct CONTENT_EXPORT SSLStatus {
SSLStatus();
SSLStatus(SecurityStyle security_style,
- int cert_id,
+ scoped_refptr<net::X509Certificate> certificate,
const net::SSLInfo& ssl_info);
SSLStatus(const SSLStatus& other);
~SSLStatus();
bool Equals(const SSLStatus& status) const {
return security_style == status.security_style &&
- cert_id == status.cert_id && cert_status == status.cert_status &&
+ !!certificate == !!status.certificate &&
+ (certificate ? certificate->Equals(status.certificate.get()) :
+ true) &&
+ cert_status == status.cert_status &&
security_bits == status.security_bits &&
key_exchange_info == status.key_exchange_info &&
connection_status == status.connection_status &&
@@ -59,8 +63,7 @@ struct CONTENT_EXPORT SSLStatus {
}
content::SecurityStyle security_style;
- // A cert_id value of 0 indicates that it is unset or invalid.
- int cert_id;
+ scoped_refptr<net::X509Certificate> certificate;
net::CertStatus cert_status;
int security_bits;
int key_exchange_info;
« no previous file with comments | « content/public/common/common_param_traits_macros.h ('k') | content/public/common/ssl_status.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698